From 43720a9855a9c98793e4500212cc8c4b217ac6c9 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 15 Apr 2024 19:26:21 +0200 Subject: [PATCH] Mangle `AdventureFlags` --- asm/main.inc | 8 +- asm/main.s | 12 +- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 6 +- asm/ov00/Item/ItemManager.inc | 4 +- asm/ov00/Item/ItemManager.s | 42 +-- asm/ov00/Player/LinkStateBase.inc | 2 +- asm/ov00/Player/LinkStateBase.s | 2 +- asm/ov00/Player/LinkStateDamage.inc | 6 +- asm/ov00/Player/LinkStateDamage.s | 6 +- asm/ov00/Player/LinkStateItem.inc | 2 +- asm/ov00/Player/LinkStateItem.s | 4 +- asm/ov00/Player/PlayerBase.inc | 2 +- asm/ov00/Player/PlayerBase.s | 2 +- asm/ov00/Player/PlayerControl.inc | 4 +- asm/ov00/Player/PlayerControl.s | 8 +- asm/ov00/Save/AdventureFlags.s | 410 ++++++++++----------- asm/ov00/ov00_020773c0.inc | 2 +- asm/ov00/ov00_020773c0.s | 2 +- asm/ov00/ov00_0207af9c.inc | 12 +- asm/ov00/ov00_0207af9c.s | 20 +- asm/ov00/ov00_020980f4.inc | 6 +- asm/ov00/ov00_020980f4.s | 12 +- asm/ov00/ov00_020b1498.inc | 16 +- asm/ov00/ov00_020b1498.s | 40 +- asm/ov00/ov00_020c3e54.inc | 18 +- asm/ov00/ov00_020c3e54.s | 38 +- asm/ov02.inc | 2 +- asm/ov02.s | 38 +- asm/ov03.inc | 12 +- asm/ov03.s | 52 +-- asm/ov04.inc | 34 +- asm/ov04.s | 44 +-- asm/ov05.inc | 12 +- asm/ov05.s | 54 +-- asm/ov09.inc | 12 +- asm/ov09.s | 24 +- asm/ov12.inc | 10 +- asm/ov12.s | 20 +- asm/ov14/ov14_0211f640.inc | 22 +- asm/ov14/ov14_0211f640.s | 122 +++---- asm/ov14/ov14_0213b778.inc | 24 +- asm/ov14/ov14_0213b778.s | 128 +++---- asm/ov15.inc | 22 +- asm/ov15.s | 546 ++++++++++++++-------------- asm/ov17.inc | 14 +- asm/ov17.s | 64 ++-- asm/ov18.inc | 16 +- asm/ov18.s | 156 ++++---- asm/ov19.inc | 14 +- asm/ov19.s | 28 +- asm/ov20.inc | 14 +- asm/ov20.s | 34 +- asm/ov22.inc | 12 +- asm/ov22.s | 32 +- asm/ov23.inc | 16 +- asm/ov23.s | 64 ++-- asm/ov24.inc | 10 +- asm/ov24.s | 36 +- asm/ov25.inc | 18 +- asm/ov25.s | 84 ++--- asm/ov26.inc | 22 +- asm/ov26.s | 62 ++-- asm/ov27.inc | 12 +- asm/ov27.s | 104 +++--- asm/ov28.inc | 16 +- asm/ov28.s | 122 +++---- asm/ov29.inc | 2 +- asm/ov29.s | 4 +- asm/ov30.inc | 6 +- asm/ov30.s | 30 +- asm/ov31.inc | 4 +- asm/ov31.s | 38 +- asm/ov32.inc | 16 +- asm/ov32.s | 34 +- asm/ov34.inc | 4 +- asm/ov34.s | 4 +- asm/ov35.inc | 14 +- asm/ov35.s | 44 +-- asm/ov36.inc | 16 +- asm/ov36.s | 88 ++--- asm/ov37.inc | 2 +- asm/ov37.s | 2 +- asm/ov38.inc | 14 +- asm/ov38.s | 32 +- asm/ov39.inc | 8 +- asm/ov39.s | 24 +- asm/ov40.inc | 20 +- asm/ov40.s | 66 ++-- asm/ov41.inc | 2 +- asm/ov41.s | 30 +- asm/ov42.inc | 2 +- asm/ov42.s | 2 +- asm/ov43.inc | 6 +- asm/ov43.s | 8 +- asm/ov45.inc | 2 +- asm/ov45.s | 6 +- asm/ov46.inc | 4 +- asm/ov46.s | 12 +- asm/ov49.inc | 8 +- asm/ov49.s | 18 +- asm/ov50.inc | 6 +- asm/ov50.s | 6 +- asm/ov52.inc | 8 +- asm/ov52.s | 28 +- asm/ov55.inc | 6 +- asm/ov55.s | 6 +- asm/ov57.inc | 2 +- asm/ov57.s | 2 +- include/Save/AdventureFlags.hpp | 101 +++++ src/00_Core/Save/AdventureFlags.cpp | 50 +++ 111 files changed, 1877 insertions(+), 1726 deletions(-) create mode 100644 include/Save/AdventureFlags.hpp diff --git a/asm/main.inc b/asm/main.inc index aefeb30b..1071f33c 100644 --- a/asm/main.inc +++ b/asm/main.inc @@ -318,10 +318,10 @@ .extern func_ov00_0208b180 .extern func_ov00_0208cae8 .extern func_ov00_0208caf8 -.extern func_ov00_02097628 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_0209779c +.extern _ZN14AdventureFlags6ExistsEv +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_0209d728 .extern func_ov00_0209d90c .extern func_ov00_020a5e9c diff --git a/asm/main.s b/asm/main.s index e59748c3..27dfccaa 100644 --- a/asm/main.s +++ b/asm/main.s @@ -76429,7 +76429,7 @@ _02037d10: ldr r0, _02037f48 ; =gAdventureFlags ldrh r1, [r4, #4] ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 moveq r0, #1 @@ -76726,7 +76726,7 @@ _0203812c: ldr r1, [r4, #4] ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add sp, sp, #0x18 mov r0, #2 ldmia sp!, {r3, r4, r5, pc} @@ -76735,7 +76735,7 @@ _0203814c: ldr r1, [r4, #4] ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add sp, sp, #0x18 mov r0, #2 ldmia sp!, {r3, r4, r5, pc} @@ -81023,12 +81023,12 @@ func_0203b5d0: ; 0x0203b5d0 bl func_0203c084 cmp r0, #0 bne _0203b628 - bl func_ov00_02097628 + bl _ZN14AdventureFlags6ExistsEv cmp r0, #0 beq _0203b630 ldr r0, _0203b760 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _0203b630 _0203b628: @@ -81714,7 +81714,7 @@ _0203bf68: bne _0203bfcc ldr r0, _0203c07c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0203bfcc ldr r0, _0203c080 ; =data_027e0db0 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index fb37d2e0..869800e4 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -53,7 +53,7 @@ .extern func_ov00_02084be0 .extern func_ov00_02084c5c .extern func_ov00_02087ef0 -.extern func_ov00_02097738 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev .extern func_ov00_020bc46c .extern func_ov00_020bc7f8 .extern func_ov00_020bc854 diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 80c871e8..5250f84a 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -805,7 +805,7 @@ _ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58 stmdb sp!, {r3, lr} ldr r0, _020c1d98 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} @@ -998,7 +998,7 @@ _ZN5Actor18func_ov00_020c1fc8Ej: ; 0x020c1fc8 mov r4, r0 ldr r0, [r2] mov r6, r1 - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x6c movne r0, #0 @@ -1326,7 +1326,7 @@ _ZN5Actor18func_ov00_020c243cEiPi: ; 0x020c243c ldr r0, _020c26f0 ; =gAdventureFlags mov r5, r1 ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x18 movne r0, #0 diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index d039d6eb..871cc044 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -16,8 +16,8 @@ .extern func_ov00_02079ffc .extern func_ov00_02084b08 .extern func_ov00_02084b14 -.extern func_ov00_02097760 -.extern func_ov00_0209779c +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020cf374 .extern func_ov00_020d73bc .extern func_ov05_02104004 diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index e809ec59..ccf8fb70 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -560,7 +560,7 @@ _020adefa: ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x13 ldr r0, [r0] - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adf12: mov r2, #0x4b @@ -573,7 +573,7 @@ _020adf12: mov r1, #9 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adf2c: mov r2, #0x4b @@ -586,7 +586,7 @@ _020adf2c: mov r1, #0xa ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adf46: mov r2, #0x4b @@ -599,7 +599,7 @@ _020adf46: mov r1, #0xb ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adf60: mov r2, #0x4b @@ -612,7 +612,7 @@ _020adf60: mov r1, #0xc ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adf7a: mov r2, #0x4b @@ -626,7 +626,7 @@ _020adf7a: mov r1, #0x2b ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adf96: mov r2, #0x4b @@ -640,7 +640,7 @@ _020adf96: mov r1, #0x30 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb mov r0, #3 mov r1, #0 bl func_ov09_0211ca20 @@ -657,7 +657,7 @@ _020adfbe: mov r1, #0x16 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adfd8: mov r2, #0x4b @@ -670,7 +670,7 @@ _020adfd8: mov r1, #0x17 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020adff2: bl _ZN11ItemManager13UpgradeQuiverEv @@ -735,7 +735,7 @@ _020ae04e: mov r1, #0x8c ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb ldr r0, _020ae248 ; =data_027e0fbc mov r1, #5 ldr r0, [r0] @@ -755,21 +755,21 @@ _020ae082: mov r1, #0x7e ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020ae090: ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020ae09e: ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7f ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb b _020ae222 _020ae0ac: mov r2, #0x4a @@ -885,7 +885,7 @@ _020ae16c: ldr r1, _020ae24c ; =0x00000126 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb mov r0, #6 mov r1, #8 bl func_ov09_0211ca20 @@ -895,7 +895,7 @@ _020ae182: ldr r1, _020ae250 ; =0x00000127 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb mov r0, #4 mov r1, #8 bl func_ov09_0211ca20 @@ -906,7 +906,7 @@ _020ae198: ldr r0, [r0] lsl r1, r1, #2 mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb mov r0, #3 mov r1, #8 bl func_ov09_0211ca20 @@ -916,7 +916,7 @@ _020ae1b0: ldr r1, _020ae254 ; =0x00000129 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb mov r0, #2 mov r1, #8 bl func_ov09_0211ca20 @@ -974,13 +974,13 @@ _020ae222: ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] - blx func_ov00_02097760 + blx _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ae270 ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] - blx func_ov00_02097760 + blx _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ae270 ldr r0, _020ae244 ; =gAdventureFlags @@ -994,14 +994,14 @@ _020ae254: .word 0x00000129 _020ae258: mov r1, #0x7f ldr r0, [r0] - blx func_ov00_02097760 + blx _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ae270 ldr r0, _020ae274 ; =gAdventureFlags mov r1, #0x80 ldr r0, [r0] mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb _020ae270: pop {r3, r4, r5, pc} nop diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index 50280740..ac8a0a58 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -32,7 +32,7 @@ .extern func_0202e58c .extern func_ov00_0207c5d4 .extern func_ov00_0208b180 -.extern func_ov00_02097bbc +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv .extern func_ov00_020a5e9c .extern func_ov00_020b1498 .extern func_ov00_020b1a4c diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index 1049642d..a769fba6 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -93,7 +93,7 @@ _020a807c: _020a8084: ldr r0, _020a80f8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov00/Player/LinkStateDamage.inc b/asm/ov00/Player/LinkStateDamage.inc index e321c8c1..af8e46c7 100644 --- a/asm/ov00/Player/LinkStateDamage.inc +++ b/asm/ov00/Player/LinkStateDamage.inc @@ -54,9 +54,9 @@ .extern func_ov00_0207c1b0 .extern func_ov00_0207c1f8 .extern func_ov00_0207c2e8 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097ff4 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb .extern func_ov00_020a5e9c .extern func_ov00_020b7e6c .extern func_ov00_020c0e24 diff --git a/asm/ov00/Player/LinkStateDamage.s b/asm/ov00/Player/LinkStateDamage.s index 628caf8e..717c8f2a 100644 --- a/asm/ov00/Player/LinkStateDamage.s +++ b/asm/ov00/Player/LinkStateDamage.s @@ -594,7 +594,7 @@ _020ac698: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb _020ac6c8: mov r0, r4 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev @@ -793,14 +793,14 @@ _020ac930: ldr r0, _020ac9e0 ; =gAdventureFlags mov r1, #0xff ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ac9bc ldr r0, _020ac9e0 ; =gAdventureFlags mov r1, #0xf ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _020ac9bc: cmp r4, #5 movne r0, #0 diff --git a/asm/ov00/Player/LinkStateItem.inc b/asm/ov00/Player/LinkStateItem.inc index 89401468..9b667992 100644 --- a/asm/ov00/Player/LinkStateItem.inc +++ b/asm/ov00/Player/LinkStateItem.inc @@ -10,7 +10,7 @@ .extern data_027e1098 .extern func_01fffcd8 .extern func_01fffcec -.extern func_ov00_02097b9c +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv .extern func_ov00_020b7e6c .extern func_ov00_020cf01c .extern func_ov00_020cf9dc diff --git a/asm/ov00/Player/LinkStateItem.s b/asm/ov00/Player/LinkStateItem.s index 3f8ce179..911a4ecc 100644 --- a/asm/ov00/Player/LinkStateItem.s +++ b/asm/ov00/Player/LinkStateItem.s @@ -187,13 +187,13 @@ _ZN13LinkStateItem18func_ov00_020abf70Ev: ; 0x020abf70 ldr r1, _020abf88 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] - ldr ip, _020abf8c ; =func_ov00_02097b9c + ldr ip, _020abf8c ; =_ZN14AdventureFlags18func_ov00_02097b9cEv ldr r1, [r2, #0x5c] bx ip .align 2, 0 arm_func_end _ZN13LinkStateItem18func_ov00_020abf70Ev _020abf88: .word gAdventureFlags -_020abf8c: .word func_ov00_02097b9c +_020abf8c: .word _ZN14AdventureFlags18func_ov00_02097b9cEv .global _ZN13LinkStateItem8vfunc_28Ev arm_func_start _ZN13LinkStateItem8vfunc_28Ev diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index c7774566..c96e5130 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -25,7 +25,7 @@ .extern func_ov00_02083ee0 .extern func_ov00_0208ae94 .extern func_ov00_0208f030 -.extern func_ov00_02097700 +.extern _ZN14AdventureFlags18func_ov00_02097700Ev .extern _ZN12ActorManager14Actor_vfunc_10Ej .extern func_ov04_0210b258 .extern func_ov04_0210b280 diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 3f0100f8..e2be8543 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -371,7 +371,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 bl func_ov00_02082af4 ldr r0, _020a7f80 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097700 + bl _ZN14AdventureFlags18func_ov00_02097700Ev _020a7f40: ldrb r0, [sp, #0x1c] cmp r0, #0 diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index d2d263f5..457a4bf4 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -52,8 +52,8 @@ .extern func_ov00_02085108 .extern func_ov00_02085594 .extern func_ov00_0208b180 -.extern func_ov00_02097738 -.extern func_ov00_02097750 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev .extern func_ov00_020a5e9c .extern func_ov00_020b78a0 .extern func_ov00_020b7924 diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 1bd82637..bdc65485 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -219,7 +219,7 @@ _ZN13PlayerControl18func_ov00_020af06cEv: ; 0x020af06c ldr r0, _020af27c ; =gAdventureFlags strneb r5, [r6, #0x7b] ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _020af280 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -588,7 +588,7 @@ _ZN13PlayerControl18func_ov00_020af538Ev: ; 0x020af538 beq _020af57c ldr r0, _020af6c4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _020af6c8 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -754,12 +754,12 @@ _ZN13PlayerControl18func_ov00_020af778Ev: ; 0x020af778 beq _020af7b8 ldr r0, _020afabc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020af7b8 ldr r0, _020afabc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 beq _020af7cc _020af7b8: diff --git a/asm/ov00/Save/AdventureFlags.s b/asm/ov00/Save/AdventureFlags.s index 5cae54d0..06cb74e9 100644 --- a/asm/ov00/Save/AdventureFlags.s +++ b/asm/ov00/Save/AdventureFlags.s @@ -3,9 +3,9 @@ .text - .global func_ov00_02097628 - arm_func_start func_ov00_02097628 -func_ov00_02097628: ; 0x02097628 + .global _ZN14AdventureFlags6ExistsEv + arm_func_start _ZN14AdventureFlags6ExistsEv +_ZN14AdventureFlags6ExistsEv: ; 0x02097628 ldr r0, _02097640 ; =gAdventureFlags ldr r0, [r0] cmp r0, #0 @@ -13,12 +13,12 @@ func_ov00_02097628: ; 0x02097628 moveq r0, #0 bx lr .align 2, 0 - arm_func_end func_ov00_02097628 + arm_func_end _ZN14AdventureFlags6ExistsEv _02097640: .word gAdventureFlags - .global func_ov00_02097644 - arm_func_start func_ov00_02097644 -func_ov00_02097644: ; 0x02097644 + .global _ZN14AdventureFlags6CopyToEPi + arm_func_start _ZN14AdventureFlags6CopyToEPi +_ZN14AdventureFlags6CopyToEPi: ; 0x02097644 stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -31,31 +31,31 @@ func_ov00_02097644: ; 0x02097644 ldmia lr, {r0, r1, r2, r3} stmia ip, {r0, r1, r2, r3} ldmia sp!, {r3, pc} - arm_func_end func_ov00_02097644 + arm_func_end _ZN14AdventureFlags6CopyToEPi - .global func_ov00_02097674 - arm_func_start func_ov00_02097674 -func_ov00_02097674: ; 0x02097674 + .global _ZN14AdventureFlags18func_ov00_02097674Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097674Ev +_ZN14AdventureFlags18func_ov00_02097674Ev: ; 0x02097674 ldr ip, _02097680 ; =func_ov00_020980f8 ldr r0, [r0, #0x40] bx ip .align 2, 0 - arm_func_end func_ov00_02097674 + arm_func_end _ZN14AdventureFlags18func_ov00_02097674Ev _02097680: .word func_ov00_020980f8 - .global func_ov00_02097684 - arm_func_start func_ov00_02097684 -func_ov00_02097684: ; 0x02097684 + .global _ZN14AdventureFlags18func_ov00_02097684Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097684Ev +_ZN14AdventureFlags18func_ov00_02097684Ev: ; 0x02097684 ldr ip, _02097690 ; =func_ov00_020980fc ldr r0, [r0, #0x40] bx ip .align 2, 0 - arm_func_end func_ov00_02097684 + arm_func_end _ZN14AdventureFlags18func_ov00_02097684Ev _02097690: .word func_ov00_020980fc - .global func_ov00_02097694 - arm_func_start func_ov00_02097694 -func_ov00_02097694: ; 0x02097694 + .global _ZN14AdventureFlags4LoadEv + arm_func_start _ZN14AdventureFlags4LoadEv +_ZN14AdventureFlags4LoadEv: ; 0x02097694 stmdb sp!, {r3, lr} ldr ip, _020976c4 ; =data_ov00_020eaac4 mov lr, r0 @@ -69,12 +69,12 @@ func_ov00_02097694: ; 0x02097694 stmia lr, {r0, r1, r2, r3} ldmia sp!, {r3, pc} .align 2, 0 - arm_func_end func_ov00_02097694 + arm_func_end _ZN14AdventureFlags4LoadEv _020976c4: .word data_ov00_020eaac4 - .global func_ov00_020976c8 - arm_func_start func_ov00_020976c8 -func_ov00_020976c8: ; 0x020976c8 + .global _ZN14AdventureFlags18func_ov00_020976c8Ev + arm_func_start _ZN14AdventureFlags18func_ov00_020976c8Ev +_ZN14AdventureFlags18func_ov00_020976c8Ev: ; 0x020976c8 stmdb sp!, {r4, lr} mov r4, r0 ldr r1, [r4, #0x40] @@ -89,11 +89,11 @@ func_ov00_020976c8: ; 0x020976c8 ldr r0, [r4, #0x44] bl func_ov00_02099024 ldmia sp!, {r4, pc} - arm_func_end func_ov00_020976c8 + arm_func_end _ZN14AdventureFlags18func_ov00_020976c8Ev - .global func_ov00_02097700 - arm_func_start func_ov00_02097700 -func_ov00_02097700: ; 0x02097700 + .global _ZN14AdventureFlags18func_ov00_02097700Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097700Ev +_ZN14AdventureFlags18func_ov00_02097700Ev: ; 0x02097700 stmdb sp!, {r4, lr} mov r4, r0 ldr r1, [r4, #0x40] @@ -108,32 +108,32 @@ func_ov00_02097700: ; 0x02097700 ldr r0, [r4, #0x44] bl func_ov00_02099024 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02097700 + arm_func_end _ZN14AdventureFlags18func_ov00_02097700Ev - .global func_ov00_02097738 - arm_func_start func_ov00_02097738 -func_ov00_02097738: ; 0x02097738 + .global _ZN14AdventureFlags18func_ov00_02097738Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097738Ev +_ZN14AdventureFlags18func_ov00_02097738Ev: ; 0x02097738 ldr r0, [r0, #0x40] ldr r0, [r0] tst r0, #1 movne r0, #1 moveq r0, #0 bx lr - arm_func_end func_ov00_02097738 + arm_func_end _ZN14AdventureFlags18func_ov00_02097738Ev - .global func_ov00_02097750 - arm_func_start func_ov00_02097750 -func_ov00_02097750: ; 0x02097750 + .global _ZN14AdventureFlags18func_ov00_02097750Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097750Ev +_ZN14AdventureFlags18func_ov00_02097750Ev: ; 0x02097750 ldr r0, _0209775c ; =data_027e0c68 ldrb r0, [r0, #4] bx lr .align 2, 0 - arm_func_end func_ov00_02097750 + arm_func_end _ZN14AdventureFlags18func_ov00_02097750Ev _0209775c: .word data_027e0c68 - .global func_ov00_02097760 - arm_func_start func_ov00_02097760 -func_ov00_02097760: ; 0x02097760 + .global _ZN14AdventureFlags3GetEj + arm_func_start _ZN14AdventureFlags3GetEj +_ZN14AdventureFlags3GetEj: ; 0x02097760 ldr r2, _02097798 ; =0x00000187 cmp r1, r2 bge _02097774 @@ -151,12 +151,12 @@ _0209777c: moveq r0, #0 bx lr .align 2, 0 - arm_func_end func_ov00_02097760 + arm_func_end _ZN14AdventureFlags3GetEj _02097798: .word 0x00000187 - .global func_ov00_0209779c - arm_func_start func_ov00_0209779c -func_ov00_0209779c: ; 0x0209779c + .global _ZN14AdventureFlags3SetEjb + arm_func_start _ZN14AdventureFlags3SetEjb +_ZN14AdventureFlags3SetEjb: ; 0x0209779c stmdb sp!, {r4, r5, r6, lr} ldr r3, _02097808 ; =0x00000187 mov r6, r1 @@ -187,13 +187,13 @@ _020977ec: str r0, [r4, r2, lsl #2] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_0209779c + arm_func_end _ZN14AdventureFlags3SetEjb _02097808: .word 0x00000187 _0209780c: .word data_027e0dbc - .global func_ov00_02097810 - arm_func_start func_ov00_02097810 -func_ov00_02097810: ; 0x02097810 + .global _ZN14AdventureFlags18func_Ov00_02097810Ei + arm_func_start _ZN14AdventureFlags18func_Ov00_02097810Ei +_ZN14AdventureFlags18func_Ov00_02097810Ei: ; 0x02097810 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0xb0 mov ip, r1 @@ -281,16 +281,16 @@ _020978e4: mov r0, r4 add sp, sp, #0xb0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02097810 + arm_func_end _ZN14AdventureFlags18func_Ov00_02097810Ei - .global func_ov00_02097968 - arm_func_start func_ov00_02097968 -func_ov00_02097968: ; 0x02097968 + .global _ZN14AdventureFlags18func_ov00_02097968Ei + arm_func_start _ZN14AdventureFlags18func_ov00_02097968Ei +_ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0xc8 mov r5, r0 mov r4, r1 - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 addne sp, sp, #0xc8 mvnne r0, #0 @@ -324,7 +324,7 @@ func_ov00_02097968: ; 0x02097968 strb ip, [sp, #0x13] strb ip, [sp, #0x14] strb ip, [sp, #0x15] - bl func_ov00_02097d10 + bl _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 ldr r0, _02097a40 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] @@ -340,13 +340,13 @@ func_ov00_02097968: ; 0x02097968 add sp, sp, #0xc8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_02097968 + arm_func_end _ZN14AdventureFlags18func_ov00_02097968Ei _02097a3c: .word data_027e0db0 _02097a40: .word data_027e0e60 - .global func_ov00_02097a44 - arm_func_start func_ov00_02097a44 -func_ov00_02097a44: ; 0x02097a44 + .global _ZN14AdventureFlags18func_ov00_02097a44Eii + arm_func_start _ZN14AdventureFlags18func_ov00_02097a44Eii +_ZN14AdventureFlags18func_ov00_02097a44Eii: ; 0x02097a44 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0xb0 mov ip, r2 @@ -434,55 +434,55 @@ _02097b1c: mov r0, r4 add sp, sp, #0xb0 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end func_ov00_02097a44 + arm_func_end _ZN14AdventureFlags18func_ov00_02097a44Eii - .global func_ov00_02097b9c - arm_func_start func_ov00_02097b9c -func_ov00_02097b9c: ; 0x02097b9c + .global _ZN14AdventureFlags18func_ov00_02097b9cEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097b9cEv +_ZN14AdventureFlags18func_ov00_02097b9cEv: ; 0x02097b9c ldr ip, _02097ba8 ; =func_ov00_02098c48 ldr r0, [r0, #0x44] bx ip .align 2, 0 - arm_func_end func_ov00_02097b9c + arm_func_end _ZN14AdventureFlags18func_ov00_02097b9cEv _02097ba8: .word func_ov00_02098c48 - .global func_ov00_02097bac - arm_func_start func_ov00_02097bac -func_ov00_02097bac: ; 0x02097bac + .global _ZN14AdventureFlags18func_ov00_02097bacEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097bacEv +_ZN14AdventureFlags18func_ov00_02097bacEv: ; 0x02097bac ldr ip, _02097bb8 ; =func_ov00_02098c68 ldr r0, [r0, #0x44] bx ip .align 2, 0 - arm_func_end func_ov00_02097bac + arm_func_end _ZN14AdventureFlags18func_ov00_02097bacEv _02097bb8: .word func_ov00_02098c68 - .global func_ov00_02097bbc - arm_func_start func_ov00_02097bbc -func_ov00_02097bbc: ; 0x02097bbc + .global _ZN14AdventureFlags18func_ov00_02097bbcEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097bbcEv +_ZN14AdventureFlags18func_ov00_02097bbcEv: ; 0x02097bbc ldr ip, _02097bc8 ; =func_ov00_02098d20 ldr r0, [r0, #0x44] bx ip .align 2, 0 - arm_func_end func_ov00_02097bbc + arm_func_end _ZN14AdventureFlags18func_ov00_02097bbcEv _02097bc8: .word func_ov00_02098d20 - .global func_ov00_02097bcc - arm_func_start func_ov00_02097bcc -func_ov00_02097bcc: ; 0x02097bcc + .global _ZN14AdventureFlags18func_ov00_02097bccEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097bccEv +_ZN14AdventureFlags18func_ov00_02097bccEv: ; 0x02097bcc ldr ip, _02097bd8 ; =func_ov00_02098fa4 ldr r0, [r0, #0x44] bx ip .align 2, 0 - arm_func_end func_ov00_02097bcc + arm_func_end _ZN14AdventureFlags18func_ov00_02097bccEv _02097bd8: .word func_ov00_02098fa4 - .global func_ov00_02097bdc - arm_func_start func_ov00_02097bdc -func_ov00_02097bdc: ; 0x02097bdc + .global _ZN14AdventureFlags18func_ov00_02097bccEi + arm_func_start _ZN14AdventureFlags18func_ov00_02097bccEi +_ZN14AdventureFlags18func_ov00_02097bccEi: ; 0x02097bdc stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -490,142 +490,142 @@ func_ov00_02097bdc: ; 0x02097bdc mov r1, r4 bl func_ov00_020990a4 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_02097bdc + arm_func_end _ZN14AdventureFlags18func_ov00_02097bccEi - .global func_ov00_02097c08 - arm_func_start func_ov00_02097c08 -func_ov00_02097c08: ; 0x02097c08 + .global _ZN14AdventureFlags18func_ov00_02097c08Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097c08Ev +_ZN14AdventureFlags18func_ov00_02097c08Ev: ; 0x02097c08 ldr ip, _02097c14 ; =func_ov00_0209907c ldr r0, [r0, #0x44] bx ip .align 2, 0 - arm_func_end func_ov00_02097c08 + arm_func_end _ZN14AdventureFlags18func_ov00_02097c08Ev _02097c14: .word func_ov00_0209907c - .global func_ov00_02097c18 - arm_func_start func_ov00_02097c18 -func_ov00_02097c18: ; 0x02097c18 + .global _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi + arm_func_start _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +_ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi: ; 0x02097c18 stmdb sp!, {r4, lr} mov r4, r0 mov r0, r1 - bl func_ov00_02097cf8 + bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei mov r1, r0 mov r0, r4 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj ldmia sp!, {r4, pc} - arm_func_end func_ov00_02097c18 + arm_func_end _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi - .global func_ov00_02097c38 - arm_func_start func_ov00_02097c38 -func_ov00_02097c38: ; 0x02097c38 + .global _ZN14AdventureFlags15Get_FlagsUnk_49Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_49Ei +_ZN14AdventureFlags15Get_FlagsUnk_49Ei: ; 0x02097c38 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097c4c ; =data_ov00_020e3155 ldrb r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097c38 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_49Ei _02097c4c: .word data_ov00_020e3155 - .global func_ov00_02097c50 - arm_func_start func_ov00_02097c50 -func_ov00_02097c50: ; 0x02097c50 + .global _ZN14AdventureFlags15Get_FlagsUnk_48Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_48Ei +_ZN14AdventureFlags15Get_FlagsUnk_48Ei: ; 0x02097c50 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097c64 ; =data_ov00_020e3154 ldrb r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097c50 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_48Ei _02097c64: .word data_ov00_020e3154 - .global func_ov00_02097c68 - arm_func_start func_ov00_02097c68 -func_ov00_02097c68: ; 0x02097c68 + .global _ZN14AdventureFlags15Get_FlagsUnk_4aEi + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_4aEi +_ZN14AdventureFlags15Get_FlagsUnk_4aEi: ; 0x02097c68 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097c7c ; =data_ov00_020e3156 ldrb r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097c68 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_4aEi _02097c7c: .word data_ov00_020e3156 - .global func_ov00_02097c80 - arm_func_start func_ov00_02097c80 -func_ov00_02097c80: ; 0x02097c80 + .global _ZN14AdventureFlags15Get_FlagsUnk_42Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_42Ei +_ZN14AdventureFlags15Get_FlagsUnk_42Ei: ; 0x02097c80 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097c94 ; =data_ov00_020e314e ldrh r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097c80 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_42Ei _02097c94: .word data_ov00_020e314e - .global func_ov00_02097c98 - arm_func_start func_ov00_02097c98 -func_ov00_02097c98: ; 0x02097c98 + .global _ZN14AdventureFlags15Get_FlagsUnk_40Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_40Ei +_ZN14AdventureFlags15Get_FlagsUnk_40Ei: ; 0x02097c98 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097cac ; =data_ov00_020e314c ldrh r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097c98 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_40Ei _02097cac: .word data_ov00_020e314c - .global func_ov00_02097cb0 - arm_func_start func_ov00_02097cb0 -func_ov00_02097cb0: ; 0x02097cb0 + .global _ZN14AdventureFlags15Get_FlagsUnk_38Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_38Ei +_ZN14AdventureFlags15Get_FlagsUnk_38Ei: ; 0x02097cb0 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097cc4 ; =data_ov00_020e3144 ldr r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097cb0 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_38Ei _02097cc4: .word data_ov00_020e3144 - .global func_ov00_02097cc8 - arm_func_start func_ov00_02097cc8 -func_ov00_02097cc8: ; 0x02097cc8 + .global _ZN14AdventureFlags15Get_FlagsUnk_34Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_34Ei +_ZN14AdventureFlags15Get_FlagsUnk_34Ei: ; 0x02097cc8 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097cdc ; =data_ov00_020e3140 ldr r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097cc8 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_34Ei _02097cdc: .word data_ov00_020e3140 - .global func_ov00_02097ce0 - arm_func_start func_ov00_02097ce0 -func_ov00_02097ce0: ; 0x02097ce0 + .global _ZN14AdventureFlags15Get_FlagsUnk_44Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_44Ei +_ZN14AdventureFlags15Get_FlagsUnk_44Ei: ; 0x02097ce0 mov r0, #0x4c mul r2, r1, r0 ldr r0, _02097cf4 ; =data_ov00_020e3150 ldr r0, [r0, r2] bx lr .align 2, 0 - arm_func_end func_ov00_02097ce0 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_44Ei _02097cf4: .word data_ov00_020e3150 - .global func_ov00_02097cf8 - arm_func_start func_ov00_02097cf8 -func_ov00_02097cf8: ; 0x02097cf8 + .global _ZN14AdventureFlags15Get_FlagsUnk_30Ei + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_30Ei +_ZN14AdventureFlags15Get_FlagsUnk_30Ei: ; 0x02097cf8 mov r1, #0x4c mul r1, r0, r1 ldr r0, _02097d0c ; =data_ov00_020e313c ldr r0, [r0, r1] bx lr .align 2, 0 - arm_func_end func_ov00_02097cf8 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_30Ei _02097d0c: .word data_ov00_020e313c - .global func_ov00_02097d10 - arm_func_start func_ov00_02097d10 -func_ov00_02097d10: ; 0x02097d10 + .global _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 +_ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2: ; 0x02097d10 stmdb sp!, {r4, lr} mov r2, #0x4c mul r2, r0, r2 @@ -659,7 +659,7 @@ func_ov00_02097d10: ; 0x02097d10 strb r2, [r1, #0x15] ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_ov00_02097d10 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 _02097d90: .word data_ov00_020e310c _02097d94: .word data_ov00_020e3110 _02097d98: .word data_ov00_020e3114 @@ -670,9 +670,9 @@ _02097da8: .word data_ov00_020e311f _02097dac: .word data_ov00_020e3120 _02097db0: .word data_ov00_020e3121 - .global func_ov00_02097db4 - arm_func_start func_ov00_02097db4 -func_ov00_02097db4: ; 0x02097db4 + .global _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 + arm_func_start _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 +_ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2: ; 0x02097db4 stmdb sp!, {r4, lr} mov r0, #0x4c mul r3, r1, r0 @@ -706,7 +706,7 @@ func_ov00_02097db4: ; 0x02097db4 strb r1, [r2, #0x15] ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_ov00_02097db4 + arm_func_end _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 _02097e34: .word data_ov00_020e3124 _02097e38: .word data_ov00_020e3128 _02097e3c: .word data_ov00_020e312c @@ -717,33 +717,33 @@ _02097e4c: .word data_ov00_020e3137 _02097e50: .word data_ov00_020e3138 _02097e54: .word data_ov00_020e3139 - .global func_ov00_02097e58 - arm_func_start func_ov00_02097e58 -func_ov00_02097e58: ; 0x02097e58 + .global _ZN14AdventureFlags12Get_FlagsUnkEi + arm_func_start _ZN14AdventureFlags12Get_FlagsUnkEi +_ZN14AdventureFlags12Get_FlagsUnkEi: ; 0x02097e58 ldr r2, _02097e68 ; =data_ov00_020e310c mov r0, #0x4c mla r0, r1, r0, r2 bx lr .align 2, 0 - arm_func_end func_ov00_02097e58 + arm_func_end _ZN14AdventureFlags12Get_FlagsUnkEi _02097e68: .word data_ov00_020e310c - .global func_ov00_02097e6c - arm_func_start func_ov00_02097e6c -func_ov00_02097e6c: ; 0x02097e6c + .global _ZN14AdventureFlags18func_ov00_02097e6cEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097e6cEv +_ZN14AdventureFlags18func_ov00_02097e6cEv: ; 0x02097e6c ldr ip, _02097e78 ; =func_ov00_02098114 ldr r0, [r0, #0x40] bx ip .align 2, 0 - arm_func_end func_ov00_02097e6c + arm_func_end _ZN14AdventureFlags18func_ov00_02097e6cEv _02097e78: .word func_ov00_02098114 - .global func_ov00_02097e7c - arm_func_start func_ov00_02097e7c -func_ov00_02097e7c: ; 0x02097e7c + .global _ZN14AdventureFlags18func_ov00_02097e7cEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097e7cEv +_ZN14AdventureFlags18func_ov00_02097e7cEv: ; 0x02097e7c stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -751,14 +751,14 @@ func_ov00_02097e7c: ; 0x02097e7c mov r1, #0 bl func_ov00_02098150 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02097e7c + arm_func_end _ZN14AdventureFlags18func_ov00_02097e7cEv - .global func_ov00_02097ea4 - arm_func_start func_ov00_02097ea4 -func_ov00_02097ea4: ; 0x02097ea4 + .global _ZN14AdventureFlags18func_ov00_02097ea4Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097ea4Ev +_ZN14AdventureFlags18func_ov00_02097ea4Ev: ; 0x02097ea4 stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -766,11 +766,11 @@ func_ov00_02097ea4: ; 0x02097ea4 mov r1, #1 bl func_ov00_02098150 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02097ea4 + arm_func_end _ZN14AdventureFlags18func_ov00_02097ea4Ev - .global func_ov00_02097ecc - arm_func_start func_ov00_02097ecc -func_ov00_02097ecc: ; 0x02097ecc + .global _ZN14AdventureFlags18func_ov00_02097eccEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097eccEv +_ZN14AdventureFlags18func_ov00_02097eccEv: ; 0x02097ecc stmdb sp!, {r4, lr} ldr r4, _02097f88 ; =data_ov00_020eaac4 ldr r0, [r4] @@ -779,7 +779,7 @@ func_ov00_02097ecc: ; 0x02097ecc tst r0, #0x80000000 bne _02097f10 mov r0, #0x20 - bl func_ov00_02097cf8 + bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei mov r1, r0, lsr #0x5 ldr r1, [r4, r1, lsl #2] and r0, r0, #0x1f @@ -794,7 +794,7 @@ _02097f10: cmp r1, #0 bne _02097f48 mov r0, #0x1f - bl func_ov00_02097cf8 + bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei mov r1, r0, lsr #0x5 ldr r1, [r4, r1, lsl #2] and r0, r0, #0x1f @@ -809,7 +809,7 @@ _02097f48: cmp r2, #0 bne _02097f80 mov r0, #0x1e - bl func_ov00_02097cf8 + bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei mov r1, r0, lsr #0x5 ldr r1, [r4, r1, lsl #2] and r0, r0, #0x1f @@ -822,12 +822,12 @@ _02097f80: mov r0, #0x21 ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_ov00_02097ecc + arm_func_end _ZN14AdventureFlags18func_ov00_02097eccEv _02097f88: .word data_ov00_020eaac4 - .global func_ov00_02097f8c - arm_func_start func_ov00_02097f8c -func_ov00_02097f8c: ; 0x02097f8c + .global _ZN14AdventureFlags18func_ov00_02097f8cEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097f8cEv +_ZN14AdventureFlags18func_ov00_02097f8cEv: ; 0x02097f8c stmdb sp!, {r3, lr} ldr r0, [r0, #0x40] ldr r0, [r0, #0x80] @@ -836,39 +836,39 @@ func_ov00_02097f8c: ; 0x02097f8c ldmeqia sp!, {r3, pc} bl func_ov40_021834cc ldmia sp!, {r3, pc} - arm_func_end func_ov00_02097f8c + arm_func_end _ZN14AdventureFlags18func_ov00_02097f8cEv - .global func_ov00_02097fac - arm_func_start func_ov00_02097fac -func_ov00_02097fac: ; 0x02097fac + .global _ZN14AdventureFlags18func_ov00_02097facEv + arm_func_start _ZN14AdventureFlags18func_ov00_02097facEv +_ZN14AdventureFlags18func_ov00_02097facEv: ; 0x02097fac stmdb sp!, {r4, lr} mov r4, r2 - bl func_ov00_02097f8c + bl _ZN14AdventureFlags18func_ov00_02097f8cEv cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} mov r1, r4 bl func_ov40_02183200 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02097fac + arm_func_end _ZN14AdventureFlags18func_ov00_02097facEv - .global func_ov00_02097fd0 - arm_func_start func_ov00_02097fd0 -func_ov00_02097fd0: ; 0x02097fd0 + .global _ZN14AdventureFlags18func_ov00_02097fd0Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02097fd0Ev +_ZN14AdventureFlags18func_ov00_02097fd0Ev: ; 0x02097fd0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_02097c08 + bl _ZN14AdventureFlags18func_ov00_02097c08Ev mov r1, r0 mov r0, r5 mov r2, r4 - bl func_ov00_02097fac + bl _ZN14AdventureFlags18func_ov00_02097facEv ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_02097fd0 + arm_func_end _ZN14AdventureFlags18func_ov00_02097fd0Ev - .global func_ov00_02097ff4 - arm_func_start func_ov00_02097ff4 -func_ov00_02097ff4: ; 0x02097ff4 + .global _ZN14AdventureFlags18func_ov00_02097ff4Ebb + arm_func_start _ZN14AdventureFlags18func_ov00_02097ff4Ebb +_ZN14AdventureFlags18func_ov00_02097ff4Ebb: ; 0x02097ff4 stmdb sp!, {r3, r4, r5, lr} movs r4, r1 mov r5, r0 @@ -895,31 +895,31 @@ _02098034: str r0, [r1, #4] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_02097ff4 + arm_func_end _ZN14AdventureFlags18func_ov00_02097ff4Ebb _02098050: .word data_027e0c54 _02098054: .word data_027e0db0 - .global func_ov00_02098058 - arm_func_start func_ov00_02098058 -func_ov00_02098058: ; 0x02098058 + .global _ZN14AdventureFlags18func_ov00_02098058Ev + arm_func_start _ZN14AdventureFlags18func_ov00_02098058Ev +_ZN14AdventureFlags18func_ov00_02098058Ev: ; 0x02098058 ldr r0, [r0, #0x40] ldr r0, [r0, #0xc] bx lr - arm_func_end func_ov00_02098058 + arm_func_end _ZN14AdventureFlags18func_ov00_02098058Ev - .global func_ov00_02098064 - arm_func_start func_ov00_02098064 -func_ov00_02098064: ; 0x02098064 + .global _ZN14AdventureFlags18func_ov00_02098064Ei + arm_func_start _ZN14AdventureFlags18func_ov00_02098064Ei +_ZN14AdventureFlags18func_ov00_02098064Ei: ; 0x02098064 ldr ip, _02098070 ; =func_ov00_02098694 ldr r0, [r0, #0x40] bx ip .align 2, 0 - arm_func_end func_ov00_02098064 + arm_func_end _ZN14AdventureFlags18func_ov00_02098064Ei _02098070: .word func_ov00_02098694 - .global func_ov00_02098074 - arm_func_start func_ov00_02098074 -func_ov00_02098074: ; 0x02098074 + .global _ZN14AdventureFlags18func_ov00_02098074Eisiib + arm_func_start _ZN14AdventureFlags18func_ov00_02098074Eisiib +_ZN14AdventureFlags18func_ov00_02098074Eisiib: ; 0x02098074 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr lr, [sp, #0x10] @@ -930,41 +930,41 @@ func_ov00_02098074: ; 0x02098074 bl func_ov00_020987c4 add sp, sp, #8 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02098074 + arm_func_end _ZN14AdventureFlags18func_ov00_02098074Eisiib - .global func_ov00_0209809c - arm_func_start func_ov00_0209809c -func_ov00_0209809c: ; 0x0209809c + .global _ZN14AdventureFlags18func_ov00_0209809cEv + arm_func_start _ZN14AdventureFlags18func_ov00_0209809cEv +_ZN14AdventureFlags18func_ov00_0209809cEv: ; 0x0209809c ldr ip, _020980a8 ; =func_ov00_02098834 ldr r0, [r0, #0x40] bx ip .align 2, 0 - arm_func_end func_ov00_0209809c + arm_func_end _ZN14AdventureFlags18func_ov00_0209809cEv _020980a8: .word func_ov00_02098834 - .global func_ov00_020980ac - arm_func_start func_ov00_020980ac -func_ov00_020980ac: ; 0x020980ac + .global _ZN14AdventureFlags18func_ov00_020980acEv + arm_func_start _ZN14AdventureFlags18func_ov00_020980acEv +_ZN14AdventureFlags18func_ov00_020980acEv: ; 0x020980ac ldr ip, _020980b8 ; =func_ov00_02098860 ldr r0, [r0, #0x40] bx ip .align 2, 0 - arm_func_end func_ov00_020980ac + arm_func_end _ZN14AdventureFlags18func_ov00_020980acEv _020980b8: .word func_ov00_02098860 - .global func_ov00_020980bc - arm_func_start func_ov00_020980bc -func_ov00_020980bc: ; 0x020980bc + .global _ZN14AdventureFlags18func_ov00_020980bcEi + arm_func_start _ZN14AdventureFlags18func_ov00_020980bcEi +_ZN14AdventureFlags18func_ov00_020980bcEi: ; 0x020980bc ldr r2, [r0, #0x40] ldr r0, [r2, #0x18] add r0, r0, r1 str r0, [r2, #0x18] bx lr - arm_func_end func_ov00_020980bc + arm_func_end _ZN14AdventureFlags18func_ov00_020980bcEi - .global func_ov00_020980d0 - arm_func_start func_ov00_020980d0 -func_ov00_020980d0: ; 0x020980d0 + .global _ZN14AdventureFlags18func_ov00_020980d0Ev + arm_func_start _ZN14AdventureFlags18func_ov00_020980d0Ev +_ZN14AdventureFlags18func_ov00_020980d0Ev: ; 0x020980d0 ldr ip, _020980e8 ; =func_0204f754 ldr r0, _020980ec ; =data_ov00_020e310c ldr r3, _020980f0 ; =func_ov00_020980f4 @@ -972,7 +972,7 @@ func_ov00_020980d0: ; 0x020980d0 mov r2, #0x4c bx ip .align 2, 0 - arm_func_end func_ov00_020980d0 + arm_func_end _ZN14AdventureFlags18func_ov00_020980d0Ev _020980e8: .word func_0204f754 _020980ec: .word data_ov00_020e310c _020980f0: .word func_ov00_020980f4 diff --git a/asm/ov00/ov00_020773c0.inc b/asm/ov00/ov00_020773c0.inc index 2d7d4768..2e1e191a 100644 --- a/asm/ov00/ov00_020773c0.inc +++ b/asm/ov00/ov00_020773c0.inc @@ -139,7 +139,7 @@ .extern func_ov00_02083588 .extern func_ov00_020849c0 .extern func_ov00_02088074 -.extern func_ov00_02097c50 +.extern _ZN14AdventureFlags15Get_FlagsUnk_48Ei .extern func_ov00_0209d738 .extern func_ov00_0209d758 .extern func_ov00_0209d768 diff --git a/asm/ov00/ov00_020773c0.s b/asm/ov00/ov00_020773c0.s index 3a233d9b..610df2a6 100644 --- a/asm/ov00/ov00_020773c0.s +++ b/asm/ov00/ov00_020773c0.s @@ -3376,7 +3376,7 @@ func_ov00_02078b88: ; 0x02078b88 bge _02078bb8 ldr r0, _02078bc0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097c50 + bl _ZN14AdventureFlags15Get_FlagsUnk_48Ei cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} diff --git a/asm/ov00/ov00_0207af9c.inc b/asm/ov00/ov00_0207af9c.inc index 36050ad1..75927c3c 100644 --- a/asm/ov00/ov00_0207af9c.inc +++ b/asm/ov00/ov00_0207af9c.inc @@ -274,12 +274,12 @@ .extern func_ov00_020798bc .extern func_ov00_02079e04 .extern func_ov00_02079e3c -.extern func_ov00_020976c8 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_02097c18 -.extern func_ov00_02097d10 -.extern func_ov00_020980d0 +.extern _ZN14AdventureFlags18func_ov00_020976c8Ev +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 +.extern _ZN14AdventureFlags18func_ov00_020980d0Ev .extern func_ov00_0209afc4 .extern func_ov00_0209b5a4 .extern func_ov00_0209b6f4 diff --git a/asm/ov00/ov00_0207af9c.s b/asm/ov00/ov00_0207af9c.s index a1acbc99..7f5493a2 100644 --- a/asm/ov00/ov00_0207af9c.s +++ b/asm/ov00/ov00_0207af9c.s @@ -3507,7 +3507,7 @@ _0207d1d4: ldr r0, _0207d3e4 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldr r1, _0207d3b0 ; =0x66666667 mov r5, r6, lsr #0x1f @@ -10840,7 +10840,7 @@ _02082ba0: _02082bac: ldr r0, _02082ce4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_020976c8 + bl _ZN14AdventureFlags18func_ov00_020976c8Ev ldr r0, _02082ce8 ; =data_027e0f64 ldr r0, [r0] bl func_ov00_0208b13c @@ -10898,7 +10898,7 @@ _02082bac: _02082c90: ldr r0, _02082ce4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_020976c8 + bl _ZN14AdventureFlags18func_ov00_020976c8Ev ldrb r1, [r5, #0x13] ldr r0, _02082d00 ; =data_027e0f90 mov r2, #0 @@ -19140,7 +19140,7 @@ func_ov00_0208967c: ; 0x0208967c ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldr r0, _02089a24 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x130 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -22616,7 +22616,7 @@ func_ov00_0208c3a4: ; 0x0208c3a4 stmdb sp!, {r3, lr} ldr r0, _0208c450 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} @@ -27792,7 +27792,7 @@ _020906fc: _0209072c: ldr r0, _02090770 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, [r4, #0x158] addeq r0, r0, #1 @@ -32241,7 +32241,7 @@ _02093e70: ldr r0, _020940d4 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 bne _02093f80 mov r5, #0 @@ -32259,7 +32259,7 @@ _02093e70: strb r5, [sp, #0x53] strb r5, [sp, #0x54] strb r5, [sp, #0x55] - bl func_ov00_02097d10 + bl _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 ldr r0, _020940cc ; =data_027e0e60 add r1, sp, #0x40 ldr r0, [r0] @@ -40150,7 +40150,7 @@ _020e0774: strb ip, [r7, #0x9ca] strb ip, [r7, #0x9cb] strb r3, [r7, #0x9cc] - ldr r1, _020e0ea4 ; =func_ov00_020980d0 + ldr r1, _020e0ea4 ; =_ZN14AdventureFlags18func_ov00_020980d0Ev strb r0, [sp, #0x63] strb r4, [sp, #0x64] strb r0, [sp, #0x65] @@ -40186,7 +40186,7 @@ _020e0e94: .word data_ov00_020e37ec _020e0e98: .word data_ov00_020e38ec _020e0e9c: .word data_ov00_020e39ec _020e0ea0: .word data_ov00_020ecdd8 -_020e0ea4: .word func_ov00_020980d0 +_020e0ea4: .word _ZN14AdventureFlags18func_ov00_020980d0Ev .global func_ov00_020e0ea8 arm_func_start func_ov00_020e0ea8 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index d7ca5d9a..479bb174 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -312,9 +312,9 @@ .extern func_ov00_02090f24 .extern func_ov00_02090f74 .extern func_ov00_0209320c -.extern func_ov00_02097628 -.extern func_ov00_02097760 -.extern func_ov00_0209779c +.extern _ZN14AdventureFlags6ExistsEv +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a956c .extern func_ov00_020a95ec .extern func_ov00_020a960c diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index f16e101f..e9e6c760 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -3921,7 +3921,7 @@ _0209b344: ldr r0, _0209b598 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r5, #0xbc b _0209b388 @@ -15073,7 +15073,7 @@ func_ov00_020a3f8c: ; 0x020a3f8c ldr r0, _020a3fbc ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0x12 moveq r0, #0x11 @@ -17502,13 +17502,13 @@ func_ov00_020a5e9c: ; 0x020a5e9c ldr r0, [r0] cmp r0, #0x11 ldmneia sp!, {r3, pc} - bl func_ov00_02097628 + bl _ZN14AdventureFlags6ExistsEv cmp r0, #0 beq _020a5ed8 ldr r0, _020a5ef0 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0x12 moveq r0, #0x11 @@ -17657,7 +17657,7 @@ func_ov00_020a602c: ; 0x020a602c ldr r0, _020a6074 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _020a6064: mov r0, #0 strb r0, [r4, #0x118] @@ -17682,7 +17682,7 @@ _020a6094: ldr r1, [r6, #0x15c] ldr r0, [r4] add r1, r1, r5 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 43a0671e..61be72a6 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -325,14 +325,14 @@ .extern func_ov00_0208b988 .extern func_ov00_0208f70c .extern func_ov00_02093a1c -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bbc -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209cbd4 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index e9397616..1a72236f 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -827,13 +827,13 @@ func_ov00_020b1e98: ; 0x020b1e98 ldr r1, _020b1eb0 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] - ldr ip, _020b1eb4 ; =func_ov00_02097b9c + ldr ip, _020b1eb4 ; =_ZN14AdventureFlags18func_ov00_02097b9cEv ldr r1, [r2, #0x38] bx ip .align 2, 0 arm_func_end func_ov00_020b1e98 _020b1eb0: .word gAdventureFlags -_020b1eb4: .word func_ov00_02097b9c +_020b1eb4: .word _ZN14AdventureFlags18func_ov00_02097b9cEv .global func_ov00_020b1eb8 arm_func_start func_ov00_020b1eb8 @@ -1292,7 +1292,7 @@ _020b23e0: mov r1, #0x104 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r3, r4, r5, pc} _020b243c: bl func_ov05_021089c0 @@ -2063,7 +2063,7 @@ func_ov00_020b2e84: ; 0x020b2e84 blt _020b2ea4 ldr r0, _020b2eb0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _020b2ea4: mvn r0, #0 str r0, [r4, #0x38] @@ -2352,7 +2352,7 @@ _020b31cc: strb r2, [sp, #0x22] strb r2, [sp, #0x23] strb r2, [sp, #0x2e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r7, #0x38] cmp r0, #0 add r0, sp, #0x18 @@ -2899,7 +2899,7 @@ _020b3968: strb r2, [sp, #0x2e] strb r3, [r4, #0xa8] ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x38] add r0, sp, #0x18 bl func_ov00_0209a508 @@ -5416,12 +5416,12 @@ _020b57a0: bne _020b5a04 ldr r0, _020b5c8c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020b5a04 ldr r0, _020b5c8c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 ldreqsh r0, [r6, #0x5a] cmpeq r0, #0 @@ -9272,12 +9272,12 @@ _020b8970: _020b8978: ldr r0, _020b8b84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020b8a04 ldr r0, _020b8b84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _020b8a04 ldrb r0, [sl, #0x11c] @@ -10008,12 +10008,12 @@ func_ov00_020b9330: ; 0x020b9330 _020b9384: ldr r0, _020b9740 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020b93b0 ldr r0, _020b9740 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 moveq r0, #0 streqb r0, [r7, #0x28e] @@ -11578,7 +11578,7 @@ _020ba8b8: ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} ldr r0, _020bac54 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _020ba914 ldr r0, _020bac58 ; =data_027e0c68 @@ -13268,7 +13268,7 @@ func_ov00_020bbbd0: ; 0x020bbbd0 _020bbc00: ldr r0, _020bbc60 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _020bbc64 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -13651,7 +13651,7 @@ func_ov00_020bc0a8: ; 0x020bc0a8 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r0, _020bc1b8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 addne sp, sp, #0x18 movne r0, #0 @@ -14371,12 +14371,12 @@ func_ov00_020bc960: ; 0x020bc960 strb r8, [sp, #0x13] strb r8, [sp, #0x14] strb r8, [sp, #0x15] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020bca38 ldr r0, _020bca44 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _020bca38 mov r0, r7 @@ -14659,7 +14659,7 @@ func_ov00_020bccc8: ; 0x020bccc8 strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r4, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _020bcda8 ; =gItemManager str r0, [r5, #0x38] ldr r0, [r1] @@ -14715,7 +14715,7 @@ func_ov00_020bcdb8: ; 0x020bcdb8 ldr r0, _020bcde8 ; =gAdventureFlags ldr r1, [r4, #0x38] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x38] ldmia sp!, {r4, pc} @@ -16495,7 +16495,7 @@ _020be37c: ldr r0, _020be408 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _020be39c: diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index cfe47855..c0b17b5b 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -523,15 +523,15 @@ .extern func_ov00_02089b00 .extern func_ov00_02093a1c .extern func_ov00_020965c0 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bbc -.extern func_ov00_02097bcc -.extern func_ov00_02097bdc +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEi .extern func_ov00_020985c0 .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index c9228372..7592c9f8 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -10972,7 +10972,7 @@ func_ov00_020cc908: ; 0x020cc908 ldr r2, _020cc924 ; =gAdventureFlags mov r4, r0 ldr r0, [r2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x218] ldmia sp!, {r4, pc} .align 2, 0 @@ -10996,13 +10996,13 @@ func_ov00_020cc940: ; 0x020cc940 ldr r1, _020cc958 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] - ldr ip, _020cc95c ; =func_ov00_02097b9c + ldr ip, _020cc95c ; =_ZN14AdventureFlags18func_ov00_02097b9cEv ldr r1, [r2, #0x218] bx ip .align 2, 0 arm_func_end func_ov00_020cc940 _020cc958: .word gAdventureFlags -_020cc95c: .word func_ov00_02097b9c +_020cc95c: .word _ZN14AdventureFlags18func_ov00_02097b9cEv .global func_ov00_020cc960 arm_func_start func_ov00_020cc960 @@ -11010,13 +11010,13 @@ func_ov00_020cc960: ; 0x020cc960 ldr r1, _020cc978 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] - ldr ip, _020cc97c ; =func_ov00_02097bcc + ldr ip, _020cc97c ; =_ZN14AdventureFlags18func_ov00_02097bccEv ldr r1, [r2, #0x218] bx ip .align 2, 0 arm_func_end func_ov00_020cc960 _020cc978: .word gAdventureFlags -_020cc97c: .word func_ov00_02097bcc +_020cc97c: .word _ZN14AdventureFlags18func_ov00_02097bccEv .global func_ov00_020cc980 arm_func_start func_ov00_020cc980 @@ -11026,12 +11026,12 @@ func_ov00_020cc980: ; 0x020cc980 mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x218] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _020cc9b8 ldr r0, _020cc9c0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} @@ -14744,7 +14744,7 @@ func_ov00_020cf678: ; 0x020cf678 ldr r0, _020cf73c ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -15341,7 +15341,7 @@ _020cfd28: _020cfd50: ldr r0, _020cfdcc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020cfdb8 ldr r0, _020cfdd0 ; =data_027e0c68 @@ -18340,7 +18340,7 @@ _020d22ec: ldr r0, _020d27c8 ; =gAdventureFlags ldr r1, [r6, #4] ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei add sp, sp, #8 mov r0, #2 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -18869,7 +18869,7 @@ _020d2a0c: ldr r0, _020d2b6c ; =gAdventureFlags add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02097bdc + bl _ZN14AdventureFlags18func_ov00_02097bccEi cmp r0, #0 bne _020d2a68 add r0, sp, #0 @@ -19254,7 +19254,7 @@ func_ov00_020d2f08: ; 0x020d2f08 ldr r0, _020d2fec ; =gAdventureFlags add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02097bdc + bl _ZN14AdventureFlags18func_ov00_02097bccEi cmp r0, #0 bne _020d2f60 add r0, sp, #0 @@ -19666,7 +19666,7 @@ _020d33d0: bl _ZN5Actor10SetUnk_11cEc ldr r0, _020d34d0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _020d3414 ldr r0, _020d34d4 ; =data_027e0c68 @@ -19700,7 +19700,7 @@ _020d3414: ldr r2, [r4, #0x50] add r1, sp, #0 str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1bc] add r0, sp, #0 bl func_ov00_0209a508 @@ -19746,7 +19746,7 @@ func_ov00_020d34d8: ; 0x020d34d8 ldr r0, _020d3514 ; =gAdventureFlags ldr r1, [r4, #0x1bc] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _020d350c: mov r0, #1 ldmia sp!, {r4, pc} @@ -20230,7 +20230,7 @@ _020d3a4c: ldr r0, _020d3b08 ; =gAdventureFlags mov r1, r5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020d3afc _020d3a6c: @@ -20343,7 +20343,7 @@ _020d3bc4: ldr r0, _020d3c74 ; =gAdventureFlags ldrh r1, [r4, #0x26] ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _020d3bfc ldrb r0, [r4, #0x29] @@ -20851,7 +20851,7 @@ func_ov00_020d4134: ; 0x020d4134 ldr r2, [r5, #0x50] add r1, sp, #0 str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x160] ldr r1, _020d423c ; =gItemManager mov r0, r5 @@ -20910,7 +20910,7 @@ func_ov00_020d4240: ; 0x020d4240 ldr r0, _020d4284 ; =gAdventureFlags ldr r1, [r4, #0x160] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _020d4274: mov r0, r4 bl func_ov00_020d3c80 diff --git a/asm/ov02.inc b/asm/ov02.inc index 4336a8d1..2083940b 100644 --- a/asm/ov02.inc +++ b/asm/ov02.inc @@ -123,7 +123,7 @@ .extern func_ov00_0208df74 .extern func_ov00_0208e420 .extern func_ov00_0208e4f4 -.extern func_ov00_02097760 +.extern _ZN14AdventureFlags3GetEj .extern func_ov00_0209cd80 .extern func_ov00_020a19fc .extern func_ov00_020a1a24 diff --git a/asm/ov02.s b/asm/ov02.s index 5d0bc16b..fb878149 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -458,7 +458,7 @@ _020ef360: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x33 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef3b0 mov r2, #0x29 @@ -515,7 +515,7 @@ _020ef438: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x76 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef488 mov r2, #0x34 @@ -536,7 +536,7 @@ _020ef488: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x75 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef4d8 mov r2, #0x35 @@ -557,7 +557,7 @@ _020ef4d8: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x77 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef528 mov r2, #0x36 @@ -578,7 +578,7 @@ _020ef528: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x9b ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef578 mov r2, #0x37 @@ -599,7 +599,7 @@ _020ef578: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0xa5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef5c8 mov r2, #0x38 @@ -689,7 +689,7 @@ _020ef6d0: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0xb5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef724 mov r3, #0x15 @@ -711,13 +711,13 @@ _020ef724: ldr r0, _020ef9a0 ; =gAdventureFlags ldr r1, _020ef9a4 ; =0x00000123 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _020ef82c ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef78c mov r2, #0x18 @@ -738,7 +738,7 @@ _020ef78c: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef7dc mov r2, #0x17 @@ -759,7 +759,7 @@ _020ef7dc: ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x7f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020ef82c mov r2, #0x19 @@ -1382,7 +1382,7 @@ _020f0000: ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xb5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r2, r4 mov r0, #0x50 @@ -1665,7 +1665,7 @@ _020f0474: ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xd4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 add r6, sp, #0x28 mov r0, #0xef @@ -1685,7 +1685,7 @@ _020f04e0: ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xd5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 add r6, sp, #0x28 mov r0, #0xef @@ -1705,7 +1705,7 @@ _020f0528: ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xd6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 add r6, sp, #0x28 mov r0, #0xef @@ -2163,28 +2163,28 @@ func_ov02_020f0b3c: ; 0x020f0b3c ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r4, #0x2e bne _020f0bcc ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r4, #0x2d bne _020f0bcc ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa3 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r4, #0x2c bne _020f0bcc ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa2 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r4, #0x2b _020f0bcc: diff --git a/asm/ov03.inc b/asm/ov03.inc index 4acba9d5..5d78598b 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -307,12 +307,12 @@ .extern func_ov00_0208c38c .extern func_ov00_0208c39c .extern func_ov00_0208ca00 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bbc -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209d748 diff --git a/asm/ov03.s b/asm/ov03.s index ea8a27a5..2a85f486 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -4431,12 +4431,12 @@ _020f128c: bne _020f1350 ldr r0, _020f139c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020f1350 ldr r0, _020f139c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _020f1350 ldr r0, _020f13a0 ; =data_027e0c68 @@ -5199,7 +5199,7 @@ func_ov03_020f1d04: ; 0x020f1d04 bne _020f1da8 ldr r0, _020f1db4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020f1da8 ldr r0, _020f1db8 ; =data_027e0c68 @@ -5685,7 +5685,7 @@ func_ov03_020f2294: ; 0x020f2294 ldmeqia sp!, {r4, pc} ldr r0, _020f2314 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _020f22d0 ldr r0, _020f2318 ; =data_027e0f90 @@ -5728,7 +5728,7 @@ func_ov03_020f2324: ; 0x020f2324 ldmeqia sp!, {r4, pc} ldr r0, _020f23a4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _020f2360 ldr r0, _020f23a8 ; =data_027e0f90 @@ -8353,13 +8353,13 @@ func_ov03_020f3cd0: ; 0x020f3cd0 ldr r0, _020f3d54 ; =gAdventureFlags mov r1, #0x2b ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020f3d0c ldr r0, _020f3d54 ; =gAdventureFlags mov r1, #0xa7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _020f3d14 _020f3d0c: @@ -8369,7 +8369,7 @@ _020f3d14: ldr r0, _020f3d54 ; =gAdventureFlags mov r1, #0xb4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020f3d4c ldr r0, _020f3d58 ; =data_027e0d38 @@ -12245,7 +12245,7 @@ func_ov03_020f5eec: ; 0x020f5eec ldr r1, _020f6150 ; =gAdventureFlags mov r6, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _020f5f3c ldr r0, _020f6154 ; =gItemManager @@ -12457,7 +12457,7 @@ func_ov03_020f6190: ; 0x020f6190 bge _020f61ec ldr r0, _020f61fc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _020f61ec _020f61e4: @@ -13318,7 +13318,7 @@ _020f6bc8: _020f6c88: ldr r0, _020f6d30 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _020f6ce4 ldr r0, [r6, #0x1e8] @@ -13342,7 +13342,7 @@ _020f6c88: _020f6ce4: ldr r0, _020f6d30 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r0, #0 streq r0, [r6, #0x1e8] @@ -13517,7 +13517,7 @@ func_ov03_020f6ef8: ; 0x020f6ef8 ldmgtia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, _020f6ffc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _020f6f58 ldr r0, _020f7000 ; =data_027e0f90 @@ -14303,7 +14303,7 @@ _020f786c: ldr r0, _020f7bbc ; =gAdventureFlags mov r1, #0xb7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _020f7908 ldr r0, _020f7bb8 ; =data_027e0f7c @@ -14370,7 +14370,7 @@ _020f7964: add r0, r7, #0x37 add r1, r0, #0x100 ldr r0, [sl] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020f79d4 ldr r1, [r6, #8] @@ -16472,12 +16472,12 @@ _020f9204: beq _020f92c8 ldr r0, [sl] mov r1, #6 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020f9288 ldr r0, [sl] ldr r1, _020f9300 ; =0x0000015f - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _020f9288 b _020f92c8 @@ -16692,7 +16692,7 @@ _020f94e0: add r0, sl, #0x37 add r1, r0, #0x100 ldr r0, [r6] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _020f9550 ldr r0, [r5] @@ -17158,7 +17158,7 @@ _020f9ab0: ldr r0, _020f9db4 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r1, #0xf mov ip, #0x32 @@ -19989,7 +19989,7 @@ func_ov03_020fb5cc: ; 0x020fb5cc strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1cc] add r0, sp, #0 bl func_ov00_0209a508 @@ -20027,7 +20027,7 @@ func_ov03_020fb654: ; 0x020fb654 strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1cc] add r0, sp, #0 bl func_ov00_0209a508 @@ -20254,13 +20254,13 @@ _020fb9b4: ldr r0, _020fbb04 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _020fb9e4 ldr r0, _020fbb04 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x1cc] _020fb9e4: @@ -20453,13 +20453,13 @@ _020fbc30: ldr r0, _020fbca4 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _020fbca4 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x1cc] ldmia sp!, {r4, pc} @@ -20696,7 +20696,7 @@ _020fbf0c: ldr r0, _020fbf34 ; =gAdventureFlags mov r1, #0x56 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj ldmia sp!, {r3, pc} _020fbf20: bl func_ov52_02195754 diff --git a/asm/ov04.inc b/asm/ov04.inc index 62a27c63..382c0d2f 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -457,23 +457,23 @@ .extern func_ov00_02097240 .extern func_ov00_020972e0 .extern func_ov00_02097354 -.extern func_ov00_02097674 -.extern func_ov00_02097684 -.extern func_ov00_02097694 -.extern func_ov00_020976c8 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097a44 -.extern func_ov00_02097c18 -.extern func_ov00_02097c38 -.extern func_ov00_02097c80 -.extern func_ov00_02097c98 -.extern func_ov00_02097cb0 -.extern func_ov00_02097cc8 -.extern func_ov00_02097ce0 -.extern func_ov00_02097d10 -.extern func_ov00_02097db4 -.extern func_ov00_02097e58 +.extern _ZN14AdventureFlags18func_ov00_02097674Ev +.extern _ZN14AdventureFlags18func_ov00_02097684Ev +.extern _ZN14AdventureFlags4LoadEv +.extern _ZN14AdventureFlags18func_ov00_020976c8Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_ov00_02097a44Eii +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +.extern _ZN14AdventureFlags15Get_FlagsUnk_49Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_42Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_40Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_38Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_34Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_44Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 +.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 +.extern _ZN14AdventureFlags12Get_FlagsUnkEi .extern func_ov00_020985c4 .extern func_ov00_02098618 .extern func_ov00_02098b90 diff --git a/asm/ov04.s b/asm/ov04.s index 48999851..6de374bf 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -138,14 +138,14 @@ _02100bf0: ldr r0, [r4] add r1, r5, r6 add r2, r7, #0 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb add r5, r5, #1 cmp r5, #4 blt _02100bf0 ldr r0, _02100c60 ; =gAdventureFlags mov r1, #0x94 ldr r0, [r0] - blx func_ov00_02097760 + blx _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02100c2c ldr r0, _02100c68 ; =data_ov00_020ec678 @@ -159,7 +159,7 @@ _02100c1c: ldr r0, [r6] add r1, r5, r7 mov r2, #1 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb add r5, r5, #1 cmp r5, r4 blt _02100c1c @@ -7233,7 +7233,7 @@ _0210443e: _02104458: str r0, [r4, #0x44] add r0, r4, #0 - blx func_ov00_02097694 + blx _ZN14AdventureFlags4LoadEv add r0, r4, #0 pop {r4, pc} .align 2, 0 @@ -7335,7 +7335,7 @@ func_ov04_021044f8: ; 0x021044f8 cmp r1, #1 bne _0210451e ldr r1, [r4, #0xc] - blx func_ov00_02097c98 + blx _ZN14AdventureFlags15Get_FlagsUnk_40Ei mov r1, #2 add r2, r0, #0 lsl r1, r1, #8 @@ -7355,7 +7355,7 @@ _02104524: ldr r0, [r5, #0x44] blx func_ov00_0209906c add r0, r5, #0 - blx func_ov00_020976c8 + blx _ZN14AdventureFlags18func_ov00_020976c8Ev pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov04_021044f8 @@ -7402,7 +7402,7 @@ _0210457a: pop {r4, r5, r6, r7, pc} _02104580: add r1, r4, #0 - blx func_ov00_02097c18 + blx _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 beq _02104590 add sp, #0x104 @@ -7424,7 +7424,7 @@ _02104590: strb r2, [r1, #0x14] add r0, r4, #0 strb r2, [r1, #0x15] - blx func_ov00_02097d10 + blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 cmp r0, #0 bne _021045bc add sp, #0x104 @@ -7482,7 +7482,7 @@ _021045bc: strb r1, [r2, #0x15] add r0, r6, #0 add r1, r4, #0 - blx func_ov00_02097db4 + blx _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 add r0, sp, #0x18 blx func_ov00_020a5e9c cmp r0, #0x47 @@ -7542,7 +7542,7 @@ _02104682: ldr r0, _021046c4 ; =gAdventureFlags add r1, r4, #0 ldr r0, [r0] - blx func_ov00_02097a44 + blx _ZN14AdventureFlags18func_ov00_02097a44Eii add r0, sp, #0x54 blx func_ov00_0209a508 add sp, #0x104 @@ -7677,7 +7677,7 @@ _02104778: beq _021047a2 ldr r0, _0210498c ; =gAdventureFlags ldr r0, [r0] - blx func_ov00_02097c38 + blx _ZN14AdventureFlags15Get_FlagsUnk_49Ei cmp r0, #0 beq _021047a2 mov r7, #1 @@ -9053,18 +9053,18 @@ _021052b6: mov r1, #0xe8 ldr r0, [r0] mov r2, #0 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb _021052ec: ldr r0, _02105314 ; =gAdventureFlags mov r1, #0x56 ldr r0, [r0] mov r2, #0 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb ldr r0, _02105314 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] mov r2, #0 - blx func_ov00_0209779c + blx _ZN14AdventureFlags3SetEjb _02105304: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -9302,7 +9302,7 @@ func_ov04_021054a4: ; 0x021054a4 ldr r0, _02105540 ; =gAdventureFlags ldr r1, [r6, #0xc] ldr r0, [r0] - blx func_ov00_02097c80 + blx _ZN14AdventureFlags15Get_FlagsUnk_42Ei add r4, #0x80 add r0, r4, r0 lsl r0, r0, #0x10 @@ -14656,7 +14656,7 @@ _02107cca: ldr r0, _02107e04 ; =gAdventureFlags ldr r1, [r4, #0x18] ldr r0, [r0] - blx func_ov00_02097cb0 + blx _ZN14AdventureFlags15Get_FlagsUnk_38Ei str r0, [r6] b _02107db2 _02107cde: @@ -15158,7 +15158,7 @@ func_ov04_02108078: ; 0x02108078 ldr r1, [r1] ldr r0, [r0] ldr r1, [r1, #0x18] - blx func_ov00_02097e58 + blx _ZN14AdventureFlags12Get_FlagsUnkEi ldrh r7, [r0, #0x3c] b _02108120 _021080a0: @@ -15244,7 +15244,7 @@ _02108120: ldr r1, [r1] ldr r0, [r0] ldr r1, [r1, #0x18] - blx func_ov00_02097e58 + blx _ZN14AdventureFlags12Get_FlagsUnkEi ldrh r2, [r0, #0x3e] b _0210819a _0210813a: @@ -18751,7 +18751,7 @@ _02109c70: ldr r0, _02109d9c ; =gAdventureFlags add r1, r2, #0 ldr r0, [r0] - blx func_ov00_02097cc8 + blx _ZN14AdventureFlags15Get_FlagsUnk_34Ei add r1, r0, #0 add r0, r4, #0 bl func_ov04_0210a050 @@ -23847,7 +23847,7 @@ _0210c370: beq _0210c3c4 ldr r0, _0210c3f8 ; =gAdventureFlags ldr r0, [r0] - blx func_ov00_02097ce0 + blx _ZN14AdventureFlags15Get_FlagsUnk_44Ei add r1, r0, #0 cmp r1, #0x2e beq _0210c3c4 @@ -23979,7 +23979,7 @@ _0210c4d0: ldr r0, [r0] ldr r2, [r6] add r1, sp, #4 - blx func_ov00_02097674 + blx _ZN14AdventureFlags18func_ov00_02097674Ev add r0, sp, #4 bl func_0203005c add r0, sp, #0x18 @@ -24010,7 +24010,7 @@ func_ov04_0210c52c: ; 0x0210c52c push {r4, lr} ldr r0, _0210c5a0 ; =gAdventureFlags ldr r0, [r0] - blx func_ov00_02097684 + blx _ZN14AdventureFlags18func_ov00_02097684Ev ldr r0, _0210c5a4 ; =data_027e0618 ldr r0, [r0] cmp r0, #2 diff --git a/asm/ov05.inc b/asm/ov05.inc index 394b2ee9..ec94b899 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -373,12 +373,12 @@ .extern func_ov00_0208cb84 .extern func_ov00_0208df2c .extern func_ov00_02095fe0 -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097bbc -.extern func_ov00_02097ff4 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb .extern func_ov00_020981b8 .extern func_ov00_02098694 .extern func_ov00_02098890 diff --git a/asm/ov05.s b/asm/ov05.s index 37433bff..c3738847 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -1957,7 +1957,7 @@ _02102498: beq _02102544 ldr r0, _021026bc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02102538 ldr r0, _021026c0 ; =data_027e1038 @@ -3710,7 +3710,7 @@ func_ov05_02103bc8: ; 0x02103bc8 mov r5, r0 ldr r0, [r1] mov r4, r2 - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #1 strneb r0, [r5, #0x24] @@ -4766,7 +4766,7 @@ _0210485c: ldr r0, _02104a30 ; =gAdventureFlags ldr r1, _02104a34 ; =0x0000015f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021048a8 ldr r0, _02104a38 ; =gItemManager @@ -4786,7 +4786,7 @@ _021048a8: ldr r0, _02104a30 ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x34 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -4839,7 +4839,7 @@ _0210493c: ldr r0, _02104a30 ; =gAdventureFlags ldr r1, _02104a44 ; =0x00000125 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02104a04 ldr r4, _02104a2c ; =data_027e0d3c @@ -5152,7 +5152,7 @@ func_ov05_02104d74: ; 0x02104d74 ldmeqia sp!, {r4, pc} ldr r0, _02104e40 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r4, pc} @@ -5438,7 +5438,7 @@ func_ov05_02105140: ; 0x02105140 _021051b8: ldr r0, _021052f8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _021052fc ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -9914,7 +9914,7 @@ func_ov05_02108e8c: ; 0x02108e8c ldr r0, [r2] mov r3, r1 mov r2, #1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb mov r0, r4 bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev ldmia sp!, {r4, pc} @@ -10217,7 +10217,7 @@ _021092f8: blt _021094f4 ldr r0, _02109514 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _021094f4 ldr r1, [r5, #0x74] @@ -10519,7 +10519,7 @@ func_ov05_021096bc: ; 0x021096bc strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x38] cmp r0, #0 blt _02109750 @@ -12040,7 +12040,7 @@ func_ov05_0210ab1c: ; 0x0210ab1c _0210ab84: ldr r0, _0210ad70 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _0210aba8 cmp r5, #0 @@ -12193,7 +12193,7 @@ func_ov05_0210ad88: ; 0x0210ad88 beq _0210ade0 ldr r0, _0210b284 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0210ade0 mov r0, r5 @@ -12553,7 +12553,7 @@ _0210b2fc: bne _0210b324 ldr r0, _0210b3b8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _0210b32c _0210b324: @@ -13212,7 +13212,7 @@ func_ov05_0210bb98: ; 0x0210bb98 beq _0210bc04 ldr r0, _0210bd5c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0210bc04 mov r0, r5 @@ -13364,7 +13364,7 @@ _0210bdec: bne _0210be14 ldr r0, _0210bf48 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _0210be1c _0210be14: @@ -15499,7 +15499,7 @@ _0210db2c: bl func_ov00_020d054c ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0210db90 ldr r0, _0210df6c ; =data_027e0c68 @@ -15519,7 +15519,7 @@ _0210db88: _0210db90: ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r0, #0 streqb r0, [r6, #0x92] @@ -15538,7 +15538,7 @@ _0210dbd4: ldr r0, _0210df68 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _0210dbf8 ldrb r0, [r6, #0x92] @@ -15654,7 +15654,7 @@ _0210dd68: bne _0210dd9c ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _0210dd9c _0210dd84: @@ -15715,7 +15715,7 @@ _0210de24: _0210de50: ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 add r0, r6, #0x1e beq _0210de70 @@ -16396,7 +16396,7 @@ _0210e760: ldr r0, _0210e898 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0210e7b8 ldr r0, _0210e878 ; =data_027e0fb8 @@ -17365,12 +17365,12 @@ _0210f52c: bne _0210f5d8 ldr r0, _0210f6d8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0210f55c ldr r0, _0210f6d8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 beq _0210f57c _0210f55c: @@ -18637,7 +18637,7 @@ _021106ac: _021106d4: ldr r0, _021107dc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _021107e0 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -19653,7 +19653,7 @@ func_ov05_021113dc: ; 0x021113dc _02111450: ldr r0, _02111a5c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02111548 ldr r0, _02111a60 ; =data_027e0d38 @@ -19865,7 +19865,7 @@ _02111744: ldr r1, _02111a5c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _02111868 ldr r3, _02111a78 ; =data_ov05_02112c04 @@ -20239,7 +20239,7 @@ func_ov05_02111c70: ; 0x02111c70 bne _02111cac ldr r0, _02111e10 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02111cac cmp sb, #0 diff --git a/asm/ov09.inc b/asm/ov09.inc index b47efb6b..f5cf8eab 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -233,12 +233,12 @@ .extern func_ov00_02083ee0 .extern func_ov00_020848b8 .extern func_ov00_02087d34 -.extern func_ov00_02097644 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_02097c68 -.extern func_ov00_02097d10 -.extern func_ov00_02097ecc +.extern _ZN14AdventureFlags6CopyToEPi +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags15Get_FlagsUnk_4aEi +.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 +.extern _ZN14AdventureFlags18func_ov00_02097eccEv .extern func_ov00_020a5e9c .extern func_ov00_020a61ac .extern func_ov00_020a956c diff --git a/asm/ov09.s b/asm/ov09.s index 03147920..a95aabb9 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -98,7 +98,7 @@ _02112caa: beq _02112ce2 mov r0, #0x17 add r1, sp, #0 - blx func_ov00_02097d10 + blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 b _02112d24 _02112ce2: ldr r0, _02112d54 ; =data_027e0618 @@ -107,7 +107,7 @@ _02112ce2: bne _02112cf4 mov r0, #0x17 add r1, sp, #0 - blx func_ov00_02097d10 + blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 b _02112d24 _02112cf4: ldr r4, _02112d58 ; =data_ov00_020eab04 @@ -116,14 +116,14 @@ _02112cf4: bne _02112d06 mov r0, #1 add r1, sp, #0 - blx func_ov00_02097d10 + blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 b _02112d24 _02112d06: - blx func_ov00_02097ecc + blx _ZN14AdventureFlags18func_ov00_02097eccEv cmp r0, #0x21 beq _02112d16 add r1, sp, #0 - blx func_ov00_02097d10 + blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 b _02112d24 _02112d16: ldr r0, [r4] @@ -3617,7 +3617,7 @@ _021148ba: ldr r0, _02114998 ; =gAdventureFlags add r1, sp, #8 ldr r0, [r0] - blx func_ov00_02097644 + blx _ZN14AdventureFlags6CopyToEPi mov r0, #0x40 str r0, [sp] ldr r0, [r5, #8] @@ -4904,7 +4904,7 @@ func_ov09_021154e8: ; 0x021154e8 mov r5, r1 mov r1, #0x30 mov r4, r2 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 cmpeq r4, #0 moveq r5, #0 @@ -4941,7 +4941,7 @@ func_ov09_0211555c: ; 0x0211555c mov r6, r1 mov r1, #0x30 mov r5, r2 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 cmpeq r5, #0 moveq r6, #0 @@ -5782,7 +5782,7 @@ _02116024: ldr r0, _0211606c ; =gAdventureFlags ldr r1, [r1, #0x18] ldr r0, [r0] - blx func_ov00_02097c68 + blx _ZN14AdventureFlags15Get_FlagsUnk_4aEi cmp r0, #0 beq _02116062 ldr r1, _02116068 ; =data_027e0ce0 @@ -14665,7 +14665,7 @@ func_ov09_0211b0dc: ; 0x0211b0dc beq _0211b164 ldr r0, _0211b368 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0211b164 ldr r0, [r6, #0x18] @@ -14691,7 +14691,7 @@ _0211b15c: _0211b164: ldr r0, _0211b368 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0211b34c ldr r0, _0211b378 ; =data_027e0f90 @@ -15703,7 +15703,7 @@ func_ov09_0211bd14: ; 0x0211bd14 stmdb sp!, {r3, lr} ldr r0, _0211bd50 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0211bd40 ldr r0, _0211bd54 ; =data_027e0f90 diff --git a/asm/ov12.inc b/asm/ov12.inc index 513b7256..39f534c6 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -432,11 +432,11 @@ .extern func_ov00_02090e10 .extern func_ov00_02090f64 .extern func_ov00_02094824 -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097810 -.extern func_ov00_02097bbc -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov12.s b/asm/ov12.s index 5a943bb3..803c3a2e 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -8653,7 +8653,7 @@ _02119c78: beq _02119d0c ldr r0, _02119dd8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02119d0c ldr r0, _02119ddc ; =data_027e0fc0 @@ -8826,7 +8826,7 @@ _02119f04: strgth r0, [r6, #8] ldr r0, _0211a3d4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02119f58 ldrsh r4, [r6, #8] @@ -10102,7 +10102,7 @@ func_ov12_0211af70: ; 0x0211af70 bne _0211b018 ldr r0, _0211b0c4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _0211b018 ldr r0, _0211b0c8 ; =data_027e0764 @@ -24534,7 +24534,7 @@ func_ov12_02126bc0: ; 0x02126bc0 ldr r0, _02126c38 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02126c3c ; =data_ov00_020ee698 ldreq r0, [r0, #0x2c] @@ -38490,7 +38490,7 @@ func_ov12_021320f4: ; 0x021320f4 ldr r0, _021321dc ; =gAdventureFlags ldr r5, [r4, #0x30] ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _02132144 ldr r0, _021321e0 ; =data_027e0c68 @@ -38533,7 +38533,7 @@ _021321b4: ldr r0, _021321dc ; =gAdventureFlags add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1bc] add r0, sp, #0 bl func_ov00_0209a508 @@ -38560,7 +38560,7 @@ func_ov12_021321e4: ; 0x021321e4 ldr r0, _0213221c ; =gAdventureFlags ldr r1, [r4, #0x1bc] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02132214: mov r0, #1 ldmia sp!, {r4, pc} @@ -40387,13 +40387,13 @@ func_ov12_02133a58: ; 0x02133a58 ldr r1, _02133b64 ; =gAdventureFlags mov r6, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0xc ldmneia sp!, {r3, r4, r5, r6, pc} ldr r0, _02133b64 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 ldreq r0, _02133b68 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -41128,7 +41128,7 @@ func_ov12_02134378: ; 0x02134378 ldmgtia sp!, {r4, pc} ldr r0, _021343b8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 9dcdb279..18c08f18 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -352,17 +352,17 @@ .extern func_ov00_02094824 .extern func_ov00_02094884 .extern func_ov00_020965c0 -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bbc -.extern func_ov00_02097bcc -.extern func_ov00_02098058 -.extern func_ov00_02098064 -.extern func_ov00_02098074 -.extern func_ov00_0209809c +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags18func_ov00_02098064Ei +.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib +.extern _ZN14AdventureFlags18func_ov00_0209809cEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209cbd4 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 16c4a6c6..cb4be224 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -5252,7 +5252,7 @@ func_ov14_02123ba8: ; 0x02123ba8 mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _02123c2c ldr r0, [r5, #0x130] @@ -5286,12 +5286,12 @@ _02123c20: _02123c2c: ldr r0, _02123c50 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _02123c50 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_02123ba8 @@ -6270,12 +6270,12 @@ _02124948: beq _021249a4 ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _021249a4 ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _021249a4 mov r1, #0 @@ -6410,12 +6410,12 @@ _02124b50: _02124b5c: ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02124b84 ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 beq _02124b8c _02124b84: @@ -6496,12 +6496,12 @@ func_ov14_02124c70: ; 0x02124c70 bne _02124cb8 ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02124cb0 ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 beq _02124cb8 _02124cb0: @@ -6514,7 +6514,7 @@ _02124cb8: ldr r0, _02124d90 ; =gAdventureFlags ldr r1, [r5, #0x178] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02124cf4 mov r0, r5 @@ -6526,12 +6526,12 @@ _02124cb8: _02124cf4: ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02124d7c ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _02124d7c ldr r0, _02124d94 ; =data_027e077c @@ -7265,12 +7265,12 @@ _02125620: ldr r0, _021258a8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, _021258ac ; =data_ov14_02153c04 ldrh r1, [r1, #4] cmp r0, r1 @@ -7296,7 +7296,7 @@ _02125698: beq _021256dc ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, _021258ac ; =data_ov14_02153c04 ldrh r1, [r1, #6] cmp r0, r1 @@ -7340,12 +7340,12 @@ _02125738: ldr r0, _021258a8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, _021258ac ; =data_ov14_02153c04 ldrh r1, [r1, #0xa] cmp r0, r1 @@ -7371,7 +7371,7 @@ _021257b0: beq _021257f4 ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, _021258ac ; =data_ov14_02153c04 ldrh r1, [r1, #0xc] cmp r0, r1 @@ -7402,7 +7402,7 @@ _02125810: _0212582c: ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -7564,7 +7564,7 @@ _021259c4: str r2, [sp, #0xd8] ldrb r2, [r4, #0x36] strb r2, [sp, #0xc0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _02125c18 ; =data_027e0e60 str r0, [r4, #0x68] ldr r0, [r1] @@ -7622,7 +7622,7 @@ _02125aa8: str r2, [sp, #0x24] ldr r2, [r4, #0x20] str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x68] add r0, sp, #0 bl func_ov00_0209a508 @@ -9042,7 +9042,7 @@ _02126b6c: ldr r0, _02127024 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02127004 _02126b90: @@ -9174,7 +9174,7 @@ _02126d58: ldr r0, _02127024 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02127004 _02126d7c: @@ -9447,7 +9447,7 @@ _0212713c: ldr r0, _02127184 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmneia sp!, {r4, pc} mov r1, #1 @@ -9575,7 +9575,7 @@ _0212731c: ldr r0, _021276ac ; =gAdventureFlags add r1, sp, #0xbc ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x64] add r0, sp, #0xbc bl func_ov00_0209a508 @@ -9715,7 +9715,7 @@ _021274f4: add r1, sp, #0xc strb r3, [sp, #0x1f] str r2, [sp, #0xa0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x64] add r0, sp, #0xc bl func_ov00_0209a508 @@ -9732,7 +9732,7 @@ _02127548: ldr r0, _021276ac ; =gAdventureFlags mov r1, #2 ldr r0, [r0] - bl func_ov00_02098064 + bl _ZN14AdventureFlags18func_ov00_02098064Ei cmp r4, #0 bne _021276a0 ldrb r0, [r5, #0x7d] @@ -10518,7 +10518,7 @@ func_ov14_02127eb8: ; 0x02127eb8 ldr r2, _02127ef0 ; =gAdventureFlags ldrh r1, [r0, #0x26] ldr r0, [r2] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj ldmia sp!, {r3, pc} _02127edc: ldr r2, _02127ef4 ; =data_027e0e60 @@ -11060,13 +11060,13 @@ _021285f0: ldr r0, _02128994 ; =gAdventureFlags ldr r1, [r7, #0xd0] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, _02128994 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -11239,7 +11239,7 @@ _02128868: ldr r0, _02128994 ; =gAdventureFlags ldr r1, [r7, #0xd0] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 str r1, [r7, #0xd0] mov r0, r7 @@ -11266,7 +11266,7 @@ _021288d0: ldr r0, _02128994 ; =gAdventureFlags ldr r1, [r7, #0xd0] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 str r1, [r7, #0xd0] mov r0, r7 @@ -11353,7 +11353,7 @@ _02128a2c: ldr r0, _02128d74 ; =gAdventureFlags ldr r1, [r4, #0xd0] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldr r1, [r4, #4] mov r0, #0x1e bic r1, r1, #4 @@ -11473,7 +11473,7 @@ _02128a84: strb ip, [sp, #0xf6] strb r3, [sp, #0xf7] strb r2, [sp, #0xf8] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0xd0] add r0, sp, #0x68 bl func_ov00_0209a508 @@ -16550,7 +16550,7 @@ func_ov14_0212cd08: ; 0x0212cd08 beq _0212ce10 ldr r0, _0212ce54 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0212ce30 _0212ce10: @@ -18503,7 +18503,7 @@ _0212e608: beq _0212e694 ldr r0, _0212e6e8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0212e6b4 _0212e694: @@ -18555,7 +18555,7 @@ _0212e704: ; jump table _0212e728: ldr r0, _0212e8cc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -18751,7 +18751,7 @@ _0212e97c: str r1, [sp, #4] ldr r0, [r0] mov r3, r2 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib ldr r0, [r4, #0x1c] ldr r3, [r4, #0x20] ldr r1, [r4, #0x18] @@ -18812,7 +18812,7 @@ _0212ea9c: ldr r0, [r0] mov r2, r1 mov r3, r1 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib b _0212eb18 _0212eacc: mov r1, #0 @@ -20579,7 +20579,7 @@ _02130254: ldr r0, _021304c0 ; =gAdventureFlags add r1, sp, #0xd8 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x70] _02130268: ldrb r0, [r6, #0xaa] @@ -20673,7 +20673,7 @@ _021303ac: ldr r0, _021304c0 ; =gAdventureFlags add r1, sp, #0x28 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x70] _021303c0: ldrb r0, [r6, #0xab] @@ -20919,12 +20919,12 @@ _02130698: ldr r2, _021306dc ; =gAdventureFlags ldr r1, [r0, #0x70] ldr r0, [r2] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _021306c4 ldr r0, _021306dc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _021306cc _021306c4: @@ -20954,12 +20954,12 @@ _021306fc: ldr r2, _02130740 ; =gAdventureFlags ldr r1, [r0, #0x70] ldr r0, [r2] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02130728 ldr r0, _02130740 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _02130730 _02130728: @@ -21503,23 +21503,23 @@ _02130e3c: _02130e7c: ldr r0, _02130f84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _02130eec ldr r0, _02130f84 ; =gAdventureFlags ldr r1, [r4, #0x70] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02130f68 ldr r0, _02130f84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d blo _02130f68 ldr r0, _02130f84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d bne _02130eec mov r0, r4 @@ -21706,7 +21706,7 @@ _02131100: str r2, [sp, #0x5c] ldrb r2, [r4, #0x36] strb r2, [sp, #0x44] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x70] mov r1, #0 ldr r0, _02131410 ; =data_027e0e60 @@ -22667,7 +22667,7 @@ func_ov14_02131d80: ; 0x02131d80 ldmeqia sp!, {r3, r4, pc} ldr r0, _02131eb8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #4 ldmneia sp!, {r3, r4, pc} @@ -23575,7 +23575,7 @@ _02132958: str r2, [sp, #0x28] ldr r2, [r5, #0x20] str r2, [sp, #0x2c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei add r0, sp, #4 bl func_ov00_0209a508 _021329bc: @@ -24199,13 +24199,13 @@ _021331ac: ldr r0, _0213339c ; =gAdventureFlags ldr r1, [r5, #0x94] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r0, _0213339c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e addlo sp, sp, #0x18 ldmloia sp!, {r4, r5, r6, r7, r8, pc} @@ -24462,7 +24462,7 @@ _021334f0: str r2, [sp, #0x44] ldrb r2, [r5, #0x36] strb r2, [sp, #0x2c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x94] mov r1, #0 add r0, sp, #0x1c @@ -29454,7 +29454,7 @@ func_ov14_02137650: ; 0x02137650 ldr r0, [r3] mov r6, r1 mov r5, r2 - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02137750 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -32247,7 +32247,7 @@ func_ov14_0213996c: ; 0x0213996c ble _0213999c ldr r0, _02139a48 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x118] @@ -32258,7 +32258,7 @@ _0213999c: ble _021399c4 ldr r0, _02139a48 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x118] @@ -32807,7 +32807,7 @@ _0213a048: ldr r2, [r4, #0x1c] add r1, sp, #0 str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x158] add r0, sp, #0 bl func_ov00_0209a508 @@ -32816,7 +32816,7 @@ _0213a048: _0213a0c4: ldr r0, _0213a148 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0xb0 ldmeqia sp!, {r4, pc} @@ -32843,7 +32843,7 @@ _0213a114: ldr r0, _0213a148 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mov r0, r4 bl _ZN5Actor4KillEv _0213a13c: diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index f4f0977e..47794217 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -407,18 +407,18 @@ .extern func_ov00_02093a4c .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bbc -.extern func_ov00_02097bcc -.extern func_ov00_02097cf8 -.extern func_ov00_02097ff4 -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a5e9c diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 473a68b3..4cb4b690 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -4999,7 +4999,7 @@ _0213f1bc: beq _0213f218 ldr r0, _0213f324 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0213f218 ldr r0, _0213f328 ; =data_027e0fc0 @@ -5138,12 +5138,12 @@ func_ov14_0213f37c: ; 0x0213f37c ldmleia sp!, {r4, pc} ldr r0, _0213f454 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} ldr r0, _0213f454 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 ldreq r0, _0213f458 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -5246,7 +5246,7 @@ func_ov14_0213f4cc: ; 0x0213f4cc ldr r0, [r0] mov r2, #1 add r3, r1, #0 - blx func_ov00_02097ff4 + blx _ZN14AdventureFlags18func_ov00_02097ff4Ebb cmp r4, #0 beq _0213f4f2 add r0, r5, #0 @@ -6484,7 +6484,7 @@ _02140118: bne _021401dc ldr r0, _021402b8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 cmpeq r4, #0 bne _021401dc @@ -7181,14 +7181,14 @@ _02140ac4: ldr r0, _0214114c ; =gAdventureFlags ldr r1, _02141150 ; =0x00000186 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x38 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02140b78 add r1, sp, #0x18 @@ -7204,7 +7204,7 @@ _02140b78: ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x38 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -7376,13 +7376,13 @@ _02140db0: ldr r0, _0214114c ; =gAdventureFlags ldr r1, _02141150 ; =0x00000186 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02140eb4 ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02140e60 add r1, sp, #0x18 @@ -7397,7 +7397,7 @@ _02140e60: ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02140eb4 add r1, sp, #0x18 @@ -8787,7 +8787,7 @@ _02142144: ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02142184 mov r0, r6 @@ -8801,12 +8801,12 @@ _02142184: ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0214248c ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e blo _0214248c _021421b0: @@ -8886,7 +8886,7 @@ _021422b0: ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _021422f0 mov r0, r6 @@ -8900,12 +8900,12 @@ _021422f0: ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0214248c ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e blo _0214248c _0214231c: @@ -8946,19 +8946,19 @@ _02142390: ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02142414 ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, [r6, #0x4c] sub r1, r1, #1 cmp r0, r1 bhs _02142414 ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1f blo _02142414 mov r1, #0 @@ -9119,7 +9119,7 @@ _021425ac: moveq r2, #0 ldr r0, [r0] strb r2, [sp, #0xd8] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x44] add r0, sp, #0xc8 bl func_ov00_0209a508 @@ -9178,7 +9178,7 @@ _0214268c: moveq r2, #0 ldr r0, [r0] strb r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x44] add r0, sp, #0x18 bl func_ov00_0209a508 @@ -10622,7 +10622,7 @@ func_ov14_0214392c: ; 0x0214392c stmdb sp!, {r3, lr} ldr r0, _021439c4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} @@ -11592,7 +11592,7 @@ func_ov14_0214418c: ; 0x0214418c ldr r0, _021442a4 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0214429c ldr r0, _021442a8 ; =data_027e0f90 @@ -12410,7 +12410,7 @@ func_ov14_02144afc: ; 0x02144afc beq _02144b4c ldr r0, _02144b60 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 movne r5, r4 _02144b4c: @@ -12524,7 +12524,7 @@ _02144ca4: beq _02144cd8 ldr r0, _02144cfc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _02144ce4 _02144cd8: @@ -12648,7 +12648,7 @@ func_ov14_02144d94: ; 0x02144d94 strb r3, [sp, #9] strb r2, [sp, #0xa] strb r2, [sp, #0xb] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] add r0, sp, #0 bl func_ov00_0209a508 @@ -12666,7 +12666,7 @@ func_ov14_02144dec: ; 0x02144dec mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x1b4] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x1b4] ldmia sp!, {r4, pc} @@ -12698,27 +12698,27 @@ func_ov14_02144e28: ; 0x02144e28 arm_func_start func_ov14_02144e3c func_ov14_02144e3c: ; 0x02144e3c ldr r2, _02144e50 ; =gAdventureFlags - ldr ip, _02144e54 ; =func_ov00_02097760 + ldr ip, _02144e54 ; =_ZN14AdventureFlags3GetEj ldrh r1, [r0, #0x22] ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov14_02144e3c _02144e50: .word gAdventureFlags -_02144e54: .word func_ov00_02097760 +_02144e54: .word _ZN14AdventureFlags3GetEj .global func_ov14_02144e58 arm_func_start func_ov14_02144e58 func_ov14_02144e58: ; 0x02144e58 ldr r2, _02144e6c ; =gAdventureFlags - ldr ip, _02144e70 ; =func_ov00_02097760 + ldr ip, _02144e70 ; =_ZN14AdventureFlags3GetEj ldrh r1, [r0, #0x26] ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov14_02144e58 _02144e6c: .word gAdventureFlags -_02144e70: .word func_ov00_02097760 +_02144e70: .word _ZN14AdventureFlags3GetEj .global func_ov14_02144e74 arm_func_start func_ov14_02144e74 @@ -15719,7 +15719,7 @@ func_ov14_02147548: ; 0x02147548 beq _02147574 ldr r0, _02147580 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #2 ldmneia sp!, {r4, pc} @@ -18129,7 +18129,7 @@ _0214943c: ldr r0, _021497f4 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02149794 ldr r0, [r4, #0x50] @@ -19157,7 +19157,7 @@ _0214a1f0: str r2, [sp, #0x30] str r3, [sp, #0x34] str r4, [sp, #0x38] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x6c] add r0, sp, #0x10 bl func_ov00_0209a508 @@ -20104,7 +20104,7 @@ _0214ae44: ldr r0, _0214ae88 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0214ae7c _0214ae64: @@ -20223,7 +20223,7 @@ func_ov14_0214af4c: ; 0x0214af4c blt _0214afc0 ldr r0, _0214b010 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x168] _0214afc0: @@ -20317,7 +20317,7 @@ _0214b0e8: ldrb r1, [r1, #0x54] strb r1, [r5, #0x172] ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _0214b130 ldr r1, [r5, #0x160] @@ -20396,7 +20396,7 @@ _0214b1f4: ldr r0, [r0] add r1, sp, #0x3c str r2, [sp, #0x40] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei b _0214b24c _0214b230: ldr r0, _0214b294 ; =gAdventureFlags @@ -20404,7 +20404,7 @@ _0214b230: ldr r0, [r0] add r1, sp, #0x3c str r2, [sp, #0x40] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x168] _0214b24c: ldr r0, [r5, #0x164] @@ -20443,7 +20443,7 @@ func_ov14_0214b2a0: ; 0x0214b2a0 blt _0214b2c8 ldr r0, _0214b2d4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x168] _0214b2c8: @@ -20485,7 +20485,7 @@ _0214b330: ldr r0, _0214b360 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0214b358 _0214b350: @@ -20802,13 +20802,13 @@ _0214b770: ldr r0, _0214b95c ; =gAdventureFlags ldr r1, [r4, #0xa0] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} ldr r0, _0214b95c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d addlo sp, sp, #0x18 ldmloia sp!, {r4, pc} @@ -20888,7 +20888,7 @@ _0214b888: _0214b8c4: ldr r0, _0214b95c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r4, pc} @@ -20991,7 +20991,7 @@ _0214b9c8: str r2, [sp, #0x24] ldr r2, [r5, #0x20] str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0xa0] add r0, sp, #0 bl func_ov00_0209a508 @@ -21064,7 +21064,7 @@ _0214bb28: beq _0214bb4c ldr r0, _0214bba8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0214bb4c: mvn r0, #0 str r0, [r5, #0xa0] @@ -21561,7 +21561,7 @@ func_ov14_0214c114: ; 0x0214c114 ldr r0, _0214c198 ; =gAdventureFlags ldrh r1, [r4, #0x26] ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, r4 beq _0214c14c @@ -22349,7 +22349,7 @@ _0214cb40: ldr r0, _0214cb98 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -22361,7 +22361,7 @@ _0214cb6c: ldr r0, _0214cb98 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -22402,7 +22402,7 @@ _0214cbdc: ldr r0, _0214cc34 ; =gAdventureFlags ldr r1, [r4, #0x15c] ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei mvn r1, #0 str r0, [r4, #0x158] cmp r0, r1 @@ -22454,7 +22454,7 @@ func_ov14_0214cc58: ; 0x0214cc58 beq _0214cc8c ldr r0, _0214ccbc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0214ccb4 _0214cc8c: @@ -22481,11 +22481,11 @@ _0214ccbc: .word gAdventureFlags func_ov14_0214ccc0: ; 0x0214ccc0 stmdb sp!, {r3, lr} ldr r0, [r0, #0x15c] - bl func_ov00_02097cf8 + bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei ldr r2, _0214cce0 ; =gAdventureFlags mov r1, r0 ldr r0, [r2] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_0214ccc0 @@ -25281,13 +25281,13 @@ _0214f1f4: ldr r0, _0214f244 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _0214f218: ldr r0, _0214f244 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xa ldmneia sp!, {r3, r4, r5, pc} ldr r0, _0214f248 ; =data_027e0fc8 @@ -25392,7 +25392,7 @@ _0214f2d0: add r1, sp, #0 strb r3, [sp, #0x10] strh r2, [sp, #0x1a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x64] add r0, sp, #0 bl func_ov00_0209a508 @@ -25756,7 +25756,7 @@ _0214f86c: ldr r0, _0214f8ec ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0214f8cc ldrb r2, [r4, #0x15] @@ -26057,7 +26057,7 @@ _0214fc34: ldr r0, _0214fc8c ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -26069,7 +26069,7 @@ _0214fc60: ldr r0, _0214fc8c ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -26124,7 +26124,7 @@ _0214fcd0: str r2, [sp, #0x24] ldr r2, [r4, #0x50] str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x158] add r0, sp, #0 bl func_ov00_0209a508 @@ -28930,7 +28930,7 @@ func_ov14_02151bec: ; 0x02151bec ldr r1, _02151dc8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #0 strne r0, [r4, #8] @@ -28941,7 +28941,7 @@ func_ov14_02151bec: ; 0x02151bec ldmneia sp!, {r4, pc} ldr r0, _02151dc8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02151dd0 ; =data_027e0618 ldreqb r0, [r0, #0x101] @@ -29907,7 +29907,7 @@ _02152820: ldr r0, _0215287c ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreq r0, [r4, #0x80] moveq r1, #1 diff --git a/asm/ov15.inc b/asm/ov15.inc index 0ca2ea90..3bece84c 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -540,17 +540,17 @@ .extern func_ov00_0209549c .extern func_ov00_02095720 .extern func_ov00_02095764 -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bcc -.extern func_ov00_02098058 -.extern func_ov00_020980bc +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags18func_ov00_020980bcEi .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209c1e4 diff --git a/asm/ov15.s b/asm/ov15.s index 1dc16c9e..bbe752f6 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -3225,7 +3225,7 @@ func_ov15_02122140: ; 0x02122140 ldr r0, _0212229c ; =gAdventureFlags mov r1, #0x30 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} @@ -8267,14 +8267,14 @@ _02126628: arm_func_start func_ov15_02126638 func_ov15_02126638: ; 0x02126638 ldr r0, _0212664c ; =gAdventureFlags - ldr ip, _02126650 ; =func_ov00_02097760 + ldr ip, _02126650 ; =_ZN14AdventureFlags3GetEj mov r1, #0x32 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov15_02126638 _0212664c: .word gAdventureFlags -_02126650: .word func_ov00_02097760 +_02126650: .word _ZN14AdventureFlags3GetEj .global func_ov15_02126654 arm_func_start func_ov15_02126654 @@ -16117,7 +16117,7 @@ func_ov15_0212ca38: ; 0x0212ca38 ldr r0, _0212cdf4 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0212ca8c ldrh r0, [r4, #0x20] @@ -16654,7 +16654,7 @@ _0212d0d8: strb ip, [sp, #0xf8] str r3, [sp, #0xfc] strb r2, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x264] mov r0, #1 strb r0, [r5, #0x1a8] @@ -17619,7 +17619,7 @@ _0212df28: mov r1, #0x81 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 mov r1, #0 mov r2, #1 @@ -19014,7 +19014,7 @@ func_ov15_0212f36c: ; 0x0212f36c ldr r0, _0212f390 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldreq r0, _0212f394 ; =data_ov15_02185dc0 @@ -19368,7 +19368,7 @@ func_ov15_0212f7b0: ; 0x0212f7b0 ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x5c movne r0, #0 @@ -19379,7 +19379,7 @@ func_ov15_0212f7b0: ; 0x0212f7b0 ldr r0, _0212fc0c ; =gAdventureFlags ldr r1, _0212fc10 ; =0x0000010f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x5c moveq r0, #0 @@ -19483,7 +19483,7 @@ _0212f824: ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x5c moveq r0, #0 @@ -19491,7 +19491,7 @@ _0212f824: ldr r0, _0212fc0c ; =gAdventureFlags ldr r1, _0212fc10 ; =0x0000010f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x5c movne r0, #0 @@ -19505,7 +19505,7 @@ _0212f824: mov r1, #0xb8 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r1, #4 str r1, [r4, #0x130] ldr r0, _0212fc24 ; =data_027e0e60 @@ -19569,7 +19569,7 @@ _0212fad4: beq _0212fbc8 ldr r0, _0212fc0c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x5c movne r0, #0 @@ -19577,7 +19577,7 @@ _0212fad4: ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0xb8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x5c moveq r0, #0 @@ -19629,7 +19629,7 @@ _0212fbb0: _0212fbc8: ldr r0, _0212fc0c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x5c moveq r0, #0 @@ -19975,7 +19975,7 @@ _0212fe8c: strb r3, [sp, #0x254] str r2, [sp, #0x258] strb fp, [sp, #0x1da] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _02130540 ; =data_027e0e60 str r0, [r5, #0x488] ldr r0, [r1] @@ -20234,7 +20234,7 @@ _02130220: strb r6, [sp, #0x13c] str r3, [sp, #0x140] strb r2, [sp, #0xc2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x488] mov r6, #0x1e000 ldr r0, _02130550 ; =data_027e0c68 @@ -20469,13 +20469,13 @@ func_ov15_021307e8: ; 0x021307e8 ldr r0, _02130908 ; =gAdventureFlags ldr r1, [r5, #0x488] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02130848 ldr r0, _02130908 ; =gAdventureFlags ldr r1, [r5, #0x48c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02130848 mov r0, #0x10000 @@ -20572,7 +20572,7 @@ func_ov15_0213091c: ; 0x0213091c ldr r0, _02130a10 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x1c ldmeqia sp!, {r4, r5, pc} @@ -20634,7 +20634,7 @@ func_ov15_02130a1c: ; 0x02130a1c ldr r0, _02130bb4 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x34 ldmneia sp!, {r3, r4, pc} @@ -20739,7 +20739,7 @@ func_ov15_02130bbc: ; 0x02130bbc ldr r0, _02130c30 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -21161,7 +21161,7 @@ _02131170: ldr r0, [r0] ldr r1, _021311c4 ; =0x0000010f mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 bl _ZN5Actor4KillEv add sp, sp, #0x1c @@ -21351,18 +21351,18 @@ _021312b0: strb r3, [sp, #0x264] str r2, [sp, #0x268] strb r8, [sp, #0x1ea] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x48c] ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021314a8 ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021314a8: ldr r0, _02131924 ; =data_027e0e2c mvn r5, #0 @@ -21510,18 +21510,18 @@ _021315c0: strb ip, [sp, #0x14c] str r3, [sp, #0x150] strb r2, [sp, #0xd2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x488] ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x48c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02131714 ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x48c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02131714: mvn r0, #0 str r0, [r4, #0x48c] @@ -21576,13 +21576,13 @@ _02131740: ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021317fc ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021317fc: mvn r3, #0 mov r0, r4 @@ -21650,7 +21650,7 @@ _021318c8: mov r1, #0xb8 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _021318fc: mov r0, r4 bl func_ov15_021327dc @@ -21760,7 +21760,7 @@ _021319e4: strb r2, [sp, #0xe2] strb r2, [sp, #0xe3] strb r2, [sp, #0xee] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x488] mov r2, #1 strb r2, [r4, #0x4c6] @@ -21859,13 +21859,13 @@ _02131b98: ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02131c1c ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02131c1c: add r0, sp, #0x28 bl func_ov00_0209a4f4 @@ -21882,7 +21882,7 @@ _02131c1c: strb r3, [sp, #0x33] strb r2, [sp, #0x34] strb r3, [sp, #0x3e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x488] add r0, sp, #0x28 bl func_ov00_0209a508 @@ -21935,7 +21935,7 @@ _02131d08: ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02131d3c mov r0, r4 @@ -21985,13 +21985,13 @@ _02131d84: ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02131df8 ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02131df8: ldr r0, _02131ef4 ; =data_027e0f64 mov r1, #1 @@ -22006,7 +22006,7 @@ _02131df8: add r1, r2, #0x110 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, #5 add sp, sp, #0x188 strb r0, [r4, #0x490] @@ -22761,7 +22761,7 @@ func_ov15_0213287c: ; 0x0213287c mov r1, #0xb8 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add sp, sp, #0x18 ldmia sp!, {r4, pc} _021328dc: @@ -23056,7 +23056,7 @@ func_ov15_02132c48: ; 0x02132c48 ldr r0, _02132de4 ; =gAdventureFlags mov r1, #0x1d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} @@ -23310,7 +23310,7 @@ _02132f8c: ldr r0, [r0] add r1, sp, #0x14 str r2, [sp, #0x3c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x36c] add r0, sp, #0x14 add r1, r5, #0x300 @@ -23412,7 +23412,7 @@ func_ov15_02133150: ; 0x02133150 ldr r0, _02133208 ; =gAdventureFlags ldr r1, [r5, #0x36c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0213319c _0213318c: @@ -23766,7 +23766,7 @@ _02133630: ldr r0, _02133ccc ; =gAdventureFlags mov r1, #0x36 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 streqb r0, [r7, #0x374] @@ -23855,13 +23855,13 @@ _021337c8: ldr r0, _02133ccc ; =gAdventureFlags ldr r1, [r7, #0x36c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02133828 ldr r0, _02133ccc ; =gAdventureFlags ldr r1, [r7, #0x36c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02133828: mvn r0, #0 str r0, [r7, #0x36c] @@ -24153,7 +24153,7 @@ _02133c00: ldr r0, [r0] mov r1, #0x36 mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r7 mov r1, #1 bl func_ov15_02132dec @@ -26299,7 +26299,7 @@ func_ov15_021358f8: ; 0x021358f8 ldr r0, _0213592c ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02135924 bl func_ov15_0212f7a0 @@ -27281,7 +27281,7 @@ func_ov15_02136670: ; 0x02136670 mov r4, r0 ldr r0, [r1] mov r1, #0x30 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -27508,7 +27508,7 @@ func_ov15_021368d8: ; 0x021368d8 _021368f4: ldr r0, _02136a68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _02136938 ldr r0, [r4, #0x264] @@ -27533,7 +27533,7 @@ _02136944: bne _02136988 ldr r0, _02136a68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02136980 ldr r0, [r4, #0x2c] @@ -29009,7 +29009,7 @@ _02137d98: strb r3, [sp, #9] strb r2, [sp, #0xa] strb r2, [sp, #0xb] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei add r0, sp, #0 bl func_ov00_0209a508 add sp, sp, #0xb0 @@ -31514,12 +31514,12 @@ func_ov15_0213a184: ; 0x0213a184 ldr r0, _0213a460 ; =gAdventureFlags strb r1, [r5, #0x26c] ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0213a254 ldr r0, _0213a460 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _0213a254 ldr r1, _0213a464 ; =data_027e0e2c @@ -31781,12 +31781,12 @@ func_ov15_0213a570: ; 0x0213a570 ldr r1, _0213a5e0 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0213a5d0 ldr r0, _0213a5e0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _0213a5d0 ldr r1, _0213a5e4 ; =data_027e0e2c @@ -35472,7 +35472,7 @@ func_ov15_0213d710: ; 0x0213d710 ldr r1, _0213d86c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0213d738 ldrb r0, [r4, #0x45] @@ -36838,7 +36838,7 @@ _0213e95c: beq _0213e98c ldr r0, _0213ea48 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0213e98c _0213e97c: @@ -37131,7 +37131,7 @@ _0213eac8: strb r8, [sp, #0x1a7] strb r7, [sp, #0x1a8] str r6, [sp, #0x1ac] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2f8] ldrb r0, [r4, #0x418] cmp r0, #0 @@ -37283,7 +37283,7 @@ _0213eac8: strb r5, [sp, #0x1a7] strb r3, [sp, #0x1a8] str r2, [sp, #0x1ac] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2fc] _0213f03c: mov r7, #0 @@ -38215,13 +38215,13 @@ _0213fd5c: ldr r0, _0213fef8 ; =gAdventureFlags ldr r1, [r5, #0x2fc] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0213fdd8 ldr r0, _0213fef8 ; =gAdventureFlags ldr r1, [r5, #0x2fc] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0213fdd8: mvn r0, #0 str r0, [r5, #0x2fc] @@ -38231,7 +38231,7 @@ _0213fde0: bne _0213fe04 ldr r0, _0213fef8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r0, #0 streqb r0, [r5, #0x344] @@ -38659,7 +38659,7 @@ _021403e0: ldmeqia sp!, {r4, pc} ldr r0, _02140420 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -38787,7 +38787,7 @@ func_ov15_0214059c: ; 0x0214059c mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x2f8] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _0214079c ldr r0, [r4, #0x138] @@ -38852,7 +38852,7 @@ _021405e4: ldr r3, [ip, #0x274] str r3, [sp, #0x34] strb r2, [sp, #0x22] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2fc] cmp r0, #0 blt _02140710 @@ -39208,7 +39208,7 @@ func_ov15_021408bc: ; 0x021408bc strb r6, [sp, #0x117] strb r5, [sp, #0x118] str lr, [sp, #0x11c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2f8] mov r2, #0 mov r0, r4 @@ -41534,7 +41534,7 @@ func_ov15_021428c4: ; 0x021428c4 mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x348] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldr r1, [r4, #0x30] mov r0, r4 bl func_ov15_02136b34 @@ -42594,7 +42594,7 @@ _021436f8: strb r2, [sp, #0x22] strb r2, [sp, #0x23] strb r2, [sp, #0x2e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r7, #0x348] add r0, sp, #0x18 bl func_ov00_0209a508 @@ -42741,7 +42741,7 @@ _02143954: ldr r0, _02143a28 ; =gAdventureFlags ldr r1, [r7, #0x348] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mov r0, r7 mov r1, #0 bl func_ov15_02175d14 @@ -42857,14 +42857,14 @@ _02143af8: ldr r0, _02143d2c ; =gAdventureFlags ldr r1, _02143d30 ; =0x00000112 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02143b70 ldr r0, _02143d2c ; =gAdventureFlags ldr r1, _02143d30 ; =0x00000112 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _02143d34 ; =data_027e0c68 ldr r5, [r0, #0x1c] cmp r5, #0 @@ -43251,7 +43251,7 @@ _02144020: strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x348] add r0, sp, #0 bl func_ov00_0209a508 @@ -43360,7 +43360,7 @@ _021441a8: strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x348] add r0, sp, #0 bl func_ov00_0209a508 @@ -43467,7 +43467,7 @@ _02144344: strb r2, [sp, #0x22] strb r2, [sp, #0x23] strb r2, [sp, #0x2e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x348] add r0, sp, #0x18 bl func_ov00_0209a508 @@ -43636,7 +43636,7 @@ _021445a4: strb r2, [sp, #0x22] strb r2, [sp, #0x23] strb r3, [sp, #0x2e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x348] add r0, sp, #0x18 bl func_ov00_0209a508 @@ -44035,7 +44035,7 @@ _02144a40: ldrb r3, [sb, #0x4b4] strb r3, [sp, #0x1a4] str r2, [sp, #0x1a8] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [sb, #0x348] mov r0, #1 strb r0, [sb, #0x34d] @@ -44570,7 +44570,7 @@ _02145390: bl func_ov00_020d71a0 ldr r0, _021457d0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _02145420 mov r0, sb @@ -44986,7 +44986,7 @@ _02145960: beq _021459f8 ldr r0, _02145b5c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, [r4, #0x344] cmpeq r0, #0 @@ -45763,7 +45763,7 @@ _02146364: ldr r0, _021464ec ; =gAdventureFlags mov r1, #0x16 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0214638c ldr r0, _021464f0 ; =data_ov15_0218f400 @@ -47914,7 +47914,7 @@ _02147f18: ldr r0, _0214807c ; =gAdventureFlags add r1, r1, #0xf3 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02147ff8 cmp r4, #0xf @@ -53417,7 +53417,7 @@ func_ov15_0214ca50: ; 0x0214ca50 beq _0214ca9c ldr r0, _0214cab0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r4, #1 _0214ca9c: @@ -56219,7 +56219,7 @@ func_ov15_0214ef04: ; 0x0214ef04 mov r7, r0 ldr r0, [r1] mov r1, #0x37 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x48 movne r0, #0 @@ -56367,7 +56367,7 @@ func_ov15_0214f114: ; 0x0214f114 ldr r0, _0214f194 ; =gAdventureFlags ldr r1, _0214f198 ; =0x0000010f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 movne r0, #1 @@ -56454,7 +56454,7 @@ _0214f1e8: strb r2, [sp, #0x17e] strb r2, [sp, #0x17f] strb r2, [sp, #0x18a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x1a8] cmp r0, r1 @@ -56507,7 +56507,7 @@ _0214f2e4: strb r3, [sp, #0xce] strb r2, [sp, #0xcf] strb r3, [sp, #0xda] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x1a8] cmp r0, r1 @@ -56599,13 +56599,13 @@ _0214f43c: ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0214f4bc ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0214f4bc: add r0, sp, #0x14 bl func_ov00_0209a4f4 @@ -56622,7 +56622,7 @@ _0214f4bc: strb r3, [sp, #0x1f] strb r2, [sp, #0x20] strb r3, [sp, #0x2a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1a8] add r0, sp, #0x14 bl func_ov00_0209a508 @@ -56699,7 +56699,7 @@ _0214f5fc: ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0214f630 mov r0, r4 @@ -56755,13 +56755,13 @@ _0214f68c: ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0214f6fc ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0214f6fc: ldr r0, _0214f738 ; =data_027e0f64 mov r1, #1 @@ -56976,7 +56976,7 @@ func_ov15_0214f9d4: ; 0x0214f9d4 str r0, [sp] ldr r0, [r1] ldr r1, _0214fbe0 ; =0x0000010f - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x60 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -58235,7 +58235,7 @@ _02150b84: beq _02150df8 ldr r0, _02150e9c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02150ea0 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -58365,7 +58365,7 @@ _02150c24: ldr r0, _02150e9c ; =gAdventureFlags add r1, sp, #0x84 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x294] add r0, sp, #0x84 bl func_ov00_0209a508 @@ -58411,7 +58411,7 @@ _02150df8: ldr r0, _02150e9c ; =gAdventureFlags ldr r1, [r5, #0x294] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r5, #0x294] _02150e5c: @@ -60229,7 +60229,7 @@ _02152590: strb r2, [sp, #0x22] strb r2, [sp, #0x23] strb r3, [sp, #0x2e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x348] mov r0, #1 mov r2, #0x800 @@ -60389,7 +60389,7 @@ func_ov15_021527d4: ; 0x021527d4 ldr r1, _021529bc ; =0x00000111 ldr r0, [r0] mov r5, #0 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021528d0 ldr r0, _021529c0 ; =gItemManager @@ -60438,7 +60438,7 @@ _021528b0: ldr r0, _021529b8 ; =gAdventureFlags mov r1, #0xe ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r5, #3 _021528d0: @@ -60617,7 +60617,7 @@ _02152abc: strb r2, [sp, #0x106] strb r2, [sp, #0x107] strb r2, [sp, #0x112] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x348] add r0, sp, #0xb4 mov r1, r5 @@ -61032,11 +61032,11 @@ _021530c4: ldr r0, _0215346c ; =gAdventureFlags ldr r1, [r5, #0x348] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldr r0, _0215346c ; =gAdventureFlags ldr r1, _0215349c ; =0x00000111 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0215319c mov r0, #0x1e @@ -61501,7 +61501,7 @@ func_ov15_02153790: ; 0x02153790 strb r2, [sp, #0x16] strb r2, [sp, #0x17] strb r3, [sp, #0x22] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x348] add r0, r4, #0x300 mov r1, #0x6000 @@ -61552,7 +61552,7 @@ _02153898: mov r1, #0xe ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _021538d8: ldr r1, _02153930 ; =0x00003fff ldr r0, _02153924 ; =gAdventureFlags @@ -61560,7 +61560,7 @@ _021538d8: ldr r0, [r0] ldr r1, _02153934 ; =0x00000111 mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add r0, r4, #0x400 mov r2, #0 strh r2, [r0, #0x4c] @@ -63951,7 +63951,7 @@ _02155abc: ldr r0, _02155b80 ; =gAdventureFlags ldr r1, _02155b84 ; =0x00000101 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02155b34 ldr r0, _02155b78 ; =data_027e0c68 @@ -64135,7 +64135,7 @@ _02155da4: ldr r0, _02156178 ; =gAdventureFlags ldr r1, _0215617c ; =0x00000101 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02155dd8 mov r0, r6 @@ -64148,14 +64148,14 @@ _02155dd8: ldr r0, _02156178 ; =gAdventureFlags ldr r1, _0215617c ; =0x00000101 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02155fa0 ldr r0, _02156178 ; =gAdventureFlags ldr r1, _0215617c ; =0x00000101 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add r0, sp, #0x80 bl func_ov00_0209a4f4 mvn r7, #0 @@ -64250,7 +64250,7 @@ _02155dd8: ldr r0, [r0] add r1, sp, #0x80 str r2, [sp, #0x114] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x2d4] mov r1, #0 str r1, [r6, #0x130] @@ -64409,7 +64409,7 @@ func_ov15_0215619c: ; 0x0215619c ldr r0, _02156204 ; =gAdventureFlags ldr r1, [r5, #0x2d4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021561d4 mov r0, r5 @@ -65865,7 +65865,7 @@ _02157548: ldr r0, _021575ac ; =gAdventureFlags ldr r1, [r4, #0x2d4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x2d4] mov r0, #0 @@ -69315,7 +69315,7 @@ func_ov15_0215a478: ; 0x0215a478 mov r3, #0 mov r1, #0x17c strb r3, [r2] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x30 movne r0, #0 @@ -69524,7 +69524,7 @@ func_ov15_0215a768: ; 0x0215a768 beq _0215a820 ldr r0, _0215a8c0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #4 moveq r0, #2 @@ -69558,7 +69558,7 @@ _0215a7f8: _0215a820: ldr r0, _0215a8c0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0215a858 mov r1, #0 @@ -69567,7 +69567,7 @@ _0215a820: mov r1, #0x17c ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add sp, sp, #8 ldmia sp!, {r4, pc} _0215a858: @@ -70010,7 +70010,7 @@ _0215ae78: ldr r0, [r0] mov r1, #0x17c mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0215ae94: mov r0, #0x8e000 mov sl, #0 @@ -71018,18 +71018,18 @@ func_ov15_0215bc48: ; 0x0215bc48 ldr r0, [r1] ldr r1, _0215bcf0 ; =0x00000186 mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0215bcec ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} ldr r0, _0215bcec ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -71131,13 +71131,13 @@ func_ov15_0215bdac: ; 0x0215bdac ldr r0, _0215be44 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0215be04 ldr r0, _0215be44 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0215be04: mvn r1, #0 ldr r0, _0215be40 ; =data_027e10a4 @@ -71211,7 +71211,7 @@ _0215be90: ldr r3, [r5, #0x274] str r3, [sp, #0x12c] strb r2, [sp, #0x11a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _0215c334 ; =data_027e10a4 str r0, [r4, #0x1b4] ldr r0, [r1] @@ -71298,7 +71298,7 @@ _0215bf70: ldr r1, _0215c344 ; =0x00000186 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0215c058: mov r0, #3 add sp, sp, #0x1b4 @@ -71407,7 +71407,7 @@ _0215c154: ldr r3, [ip, #0x274] str r3, [sp, #0x7c] strb r2, [sp, #0x6a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _0215c334 ; =data_027e10a4 str r0, [r4, #0x1b4] ldr r0, [r1] @@ -71475,13 +71475,13 @@ _0215c29c: ldr r0, _0215c330 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0215c31c ldr r0, _0215c330 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0215c31c: mvn r0, #0 str r0, [r4, #0x1b4] @@ -71620,7 +71620,7 @@ _0215c474: ldr r3, [ip, #0x274] str r3, [sp, #0x4c] strb r2, [sp, #0x3a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _0215c55c ; =data_027e10a4 str r0, [r4, #0x1b4] ldr r0, [r1] @@ -71689,7 +71689,7 @@ func_ov15_0215c584: ; 0x0215c584 ldr r2, [r3, #0x274] str r2, [sp, #0x28] strb ip, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] add r0, sp, #0 bl func_ov00_0209a508 @@ -73682,7 +73682,7 @@ _0215deb8: ldr r1, _0215dff0 ; =data_ov15_02186700 ldr r0, [r0] ldr r1, [r1, r2, lsl #2] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0215dfa4 mov r0, #0x46 @@ -76193,7 +76193,7 @@ _02160348: ldr r1, _021603e0 ; =data_ov15_02186700 ldr r0, [r0] ldr r1, [r1, r3, lsl #2] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _021603d0 _02160384: mov r1, #5 @@ -76622,7 +76622,7 @@ func_ov15_021607fc: ; 0x021607fc beq _02160838 ldr r0, _02160c08 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x5c moveq r0, #0 @@ -76643,13 +76643,13 @@ _02160838: ldr r0, _02160c08 ; =gAdventureFlags mov r1, #0xb3 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02160898 ldr r0, _02160c08 ; =gAdventureFlags mov r1, #0xa7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021608cc _02160898: @@ -77062,7 +77062,7 @@ _02160e64: beq _021610c0 ldr r0, _02161170 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02161174 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -77186,7 +77186,7 @@ _02160ef8: strb r4, [sp, #0xf8] str r3, [sp, #0xfc] strb r2, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x390] add r0, sp, #0x68 bl func_ov00_0209a508 @@ -77232,7 +77232,7 @@ _021610c0: ldr r0, _02161170 ; =gAdventureFlags ldr r1, [r5, #0x390] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r5, #0x390] _02161124: @@ -77838,13 +77838,13 @@ func_ov15_02161920: ; 0x02161920 ldr r0, _02161964 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02161954 ldr r0, _02161964 ; =gAdventureFlags mov r1, #0xf5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216195c _02161954: @@ -77977,24 +77977,24 @@ func_ov15_02161ac0: ; 0x02161ac0 ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02161af8 ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02161af8: ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02161b20 ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02161b20: ldrb r0, [r4, #0x3d1] cmp r0, #0 @@ -78042,24 +78042,24 @@ func_ov15_02161ba0: ; 0x02161ba0 ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02161bd8 ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02161bd8: ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02161c00 ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02161c00: ldrb r0, [r4, #0x3d1] cmp r0, #0 @@ -78108,13 +78108,13 @@ func_ov15_02161c88: ; 0x02161c88 mov sl, r0 ldr r0, [r1] mov r1, #0x1f - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02161cc4 ldr r0, _02162424 ; =gAdventureFlags mov r1, #0xf5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02161cd0 _02161cc4: @@ -78239,12 +78239,12 @@ _02161cd0: ldr r0, _02162424 ; =gAdventureFlags mov r2, #0 ldr r0, [r0] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _02161f2c _02161eac: ldr r0, _02162424 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02161f2c cmp r7, r5 @@ -78276,7 +78276,7 @@ _02161f18: mov r1, #0x62 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _02161f2c: ldr r1, _02162438 ; =data_027e0fe4 ldr r0, _02162424 ; =gAdventureFlags @@ -78284,13 +78284,13 @@ _02161f2c: mov r1, #0x52 strb r5, [r2, #0x38] ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02161f88 ldr r0, _02162424 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02161f88 ldr r1, _0216243c ; =data_ov15_0218cc00 @@ -78836,7 +78836,7 @@ _021626dc: ldr r0, _02162de0 ; =gAdventureFlags add r1, sp, #0xb4 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x240] add r0, sp, #0xb4 bl func_ov00_0209a508 @@ -78860,7 +78860,7 @@ _02162744: ldr r0, _02162de0 ; =gAdventureFlags add r1, sp, #4 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x240] add r0, sp, #4 bl func_ov00_0209a508 @@ -79005,13 +79005,13 @@ _02162984: ldr r0, _02162de0 ; =gAdventureFlags ldr r1, [r5, #0x240] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021629c0 ldr r0, _02162de0 ; =gAdventureFlags ldr r1, [r5, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r5, #0x240] _021629c0: @@ -79108,7 +79108,7 @@ _021629c0: ldr r0, _02162de0 ; =gAdventureFlags add r1, sp, #0x2e4 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x240] ldr r0, _02162de4 ; =data_027e0c68 ldr r2, _02162e08 ; =0x00050022 @@ -79265,7 +79265,7 @@ _02162b58: strb r2, [sp, #0x25c] str fp, [sp, #0x260] strb sl, [sp, #0x1e2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x240] ldr r0, _02162de4 ; =data_027e0c68 ldr r2, _02162e10 ; =0x00050046 @@ -79331,7 +79331,7 @@ _02162e74: blt _02163b90 ldr r0, _02163c2c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02163c30 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -79433,7 +79433,7 @@ _02162f64: beq _02163050 ldr r0, _02163c2c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02163c30 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -80033,7 +80033,7 @@ _02163854: mov r1, #0x62 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0216391c: ldr r0, _02163c44 ; =data_027e10a4 mov r1, #1 @@ -80379,20 +80379,20 @@ _02163dc4: ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x324 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x244] add r0, sp, #0x324 bl func_ov00_0209a508 ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02163e4c ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02163e4c: ldr r0, _021643ac ; =data_027e0c68 mvn r3, #0 @@ -80426,20 +80426,20 @@ _02163e90: ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x274 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x240] add r0, sp, #0x274 bl func_ov00_0209a508 ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02163efc ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02163efc: mvn r0, #0 str r0, [r6, #0x244] @@ -80462,7 +80462,7 @@ _02163f14: ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x1c4 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x244] add r0, sp, #0x1c4 bl func_ov00_0209a508 @@ -80475,13 +80475,13 @@ _02163f14: str r1, [r6, #0x370] ldr r0, [r0] ldr r1, [r6, #0x240] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02163f9c ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02163f9c: add r0, sp, #0x114 mov r1, r6 @@ -80490,7 +80490,7 @@ _02163f9c: ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x114 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x240] add r0, sp, #0x114 bl func_ov00_0209a508 @@ -80553,13 +80553,13 @@ _0216406c: ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021640c4 ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021640c4: ldr r0, [r6, #0x248] cmp r0, #0x1e @@ -80669,7 +80669,7 @@ _021640c4: ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x64 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0x244] add r0, sp, #0x64 bl func_ov00_0209a508 @@ -80696,13 +80696,13 @@ _021642cc: ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021642f4 ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021642f4: mvn r2, #0 mov r0, r6 @@ -80723,13 +80723,13 @@ _02164324: ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02164358 ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02164358: mvn r2, #0 mov r0, r6 @@ -80796,13 +80796,13 @@ _02164410: ldr r0, _02164474 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02164458 ldr r0, _02164474 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02164458: mvn r2, #0 mov r0, r4 @@ -80829,7 +80829,7 @@ func_ov15_02164478: ; 0x02164478 bne _021644c4 ldr r0, _021645f0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _021644c4 ldr r0, _021645f4 ; =data_027e10a4 @@ -82113,13 +82113,13 @@ _0216569c: ldr r0, _02165a28 ; =gAdventureFlags ldr r1, [r5, #0xd8] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r3, r4, r5, r6, pc} ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82138,7 +82138,7 @@ _0216569c: _02165700: ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82157,7 +82157,7 @@ _02165700: _02165748: ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82185,7 +82185,7 @@ _0216579c: _021657b0: ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82204,7 +82204,7 @@ _021657b0: _021657f8: ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82241,7 +82241,7 @@ _02165840: ldr r2, _02165a28 ; =gAdventureFlags mov r1, r0, asr #0x10 ldr r0, [r2] - bl func_ov00_020980bc + bl _ZN14AdventureFlags18func_ov00_020980bcEi mov r0, r5 ldr r3, [r0] mov r1, #8 @@ -82256,7 +82256,7 @@ _021658b4: bgt _021658f0 ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82269,7 +82269,7 @@ _021658b4: _021658f0: ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82292,7 +82292,7 @@ _02165938: bgt _02165974 ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82305,7 +82305,7 @@ _02165938: _02165974: ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r2, [r5, #8] ldr r1, _02165a2c ; =data_ov15_021867d8 mov r2, r2, lsl #0x1 @@ -82326,7 +82326,7 @@ _021659bc: ldr r0, _02165a28 ; =gAdventureFlags ldr r1, [r5, #0xd8] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r3, r4, r5, r6, pc} @@ -82440,7 +82440,7 @@ _02165b24: strb r3, [sp, #0x186] strb r2, [sp, #0x187] strb r3, [sp, #0x192] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0xd8] add r0, sp, #0x17c bl func_ov00_0209a508 @@ -82582,7 +82582,7 @@ _02165d5c: ldr r0, _02165e24 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] - bl func_ov00_020980bc + bl _ZN14AdventureFlags18func_ov00_020980bcEi b _02165e14 _02165d70: ldr r1, [r4, #4] @@ -83780,7 +83780,7 @@ func_ov15_02166bd0: ; 0x02166bd0 mov r4, r0 ldr r0, [r1] mov r1, #0x30 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -86685,7 +86685,7 @@ func_ov15_02169358: ; 0x02169358 ldr r0, _021694e4 ; =gAdventureFlags mov r1, #0xb7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x20 movne r0, #0 @@ -86912,7 +86912,7 @@ func_ov15_02169684: ; 0x02169684 ldr r0, _02169700 ; =gAdventureFlags ldr r1, [r4, #0x2d8] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021696e0 _021696cc: @@ -87399,7 +87399,7 @@ _02169c3c: str r2, [sp, #0xac] strb ip, [sp, #0xf8] str r3, [sp, #0xfc] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x2d8] add r0, sp, #0x68 bl func_ov00_0209a508 @@ -87408,13 +87408,13 @@ _02169dc8: ldr r0, _02169e5c ; =gAdventureFlags ldr r1, [r5, #0x2d8] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02169df0 ldr r0, _02169e5c ; =gAdventureFlags ldr r1, [r5, #0x2d8] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02169df0: ldr r0, _02169e4c ; =data_027e0c68 mvn r3, #0 @@ -87638,7 +87638,7 @@ _0216a0cc: mov r1, #0xb7 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, pc} _0216a0e4: bl _ZN5Actor4KillEv @@ -87992,7 +87992,7 @@ func_ov15_0216a590: ; 0x0216a590 mov r8, fp mov sb, fp mov sl, fp - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0216a614 ldr r0, _0216a738 ; =data_027e0c68 @@ -88065,13 +88065,13 @@ _0216a6c4: ldr r0, _0216a734 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #1 bne _0216a6fc ldr r0, _0216a734 ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216a704 _0216a6fc: @@ -88367,7 +88367,7 @@ func_ov15_0216aa84: ; 0x0216aa84 blx func_ov03_020fab5c ldr r0, _0216aad0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 bne _0216aabc cmp r4, #0 @@ -91845,7 +91845,7 @@ func_ov15_0216d8c8: ; 0x0216d8c8 mov r1, #0x100 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 @@ -91909,7 +91909,7 @@ _0216d9b0: mov r1, #0x56 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0216da38: ldr r0, _0216da94 ; =data_027e0c68 mov r1, #0 @@ -92200,7 +92200,7 @@ _0216de0c: _0216de14: ldr r0, _0216de3c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -93642,7 +93642,7 @@ _0216f158: bl func_ov00_020c5e20 ldr r0, _0216f324 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 beq _0216f1ec ldr r1, [r4, #0x158] @@ -94718,7 +94718,7 @@ _0216fe54: strb r2, [sp, #0x318] str fp, [sp, #0x31c] strb sl, [sp, #0x29e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei add r1, r5, #0xf8 str r0, [r5, #0x53c] add r0, r1, #0x400 @@ -94745,13 +94745,13 @@ _0217007c: ldr r0, _02170638 ; =gAdventureFlags ldr r1, [r5, #0x53c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021700a4 ldr r0, _02170638 ; =gAdventureFlags ldr r1, [r5, #0x53c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021700a4: ldr r0, _0217063c ; =data_027e10a4 ldr r0, [r0] @@ -94921,7 +94921,7 @@ _0217029c: str r6, [sp, #0x194] str r2, [sp, #0x198] strb r3, [sp, #0x186] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x53c] add r6, sp, #0x38 add r1, sp, #0x48 @@ -95084,7 +95084,7 @@ _021703e8: strb r2, [sp, #0x150] str lr, [sp, #0x154] strb ip, [sp, #0xd6] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x53c] ldr r1, _0217063c ; =data_027e10a4 mov r0, r5 @@ -95181,13 +95181,13 @@ func_ov15_021706b4: ; 0x021706b4 ldr r0, _02170750 ; =gAdventureFlags ldr r1, [r5, #0x53c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02170734 ldr r0, _02170750 ; =gAdventureFlags ldr r1, [r5, #0x540] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0217073c _02170734: @@ -95630,18 +95630,18 @@ _02170ac8: strb r2, [sp, #0x20c] str fp, [sp, #0x210] strb sl, [sp, #0x192] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x540] ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x53c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02170db8 ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x53c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02170db8: mvn r0, #0 str r0, [r4, #0x53c] @@ -95770,13 +95770,13 @@ _02170eec: ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x540] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02170fc4 ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x540] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02170fc4: mvn r2, #0 mov r0, r4 @@ -96211,13 +96211,13 @@ _021715ac: strb r1, [r4, #0x56c] ldr r0, [r0] ldr r1, [r4, #0x53c] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0217161c ldr r0, _02171918 ; =gAdventureFlags ldr r1, [r4, #0x53c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0217161c: mvn r1, #0 str r1, [r4, #0x53c] @@ -96303,7 +96303,7 @@ _02171640: ldr r3, [ip, #0x274] str r3, [sp, #0x160] strb r2, [sp, #0x14e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _02171920 ; =data_027e10a4 str r0, [r4, #0x53c] ldr r0, [r1] @@ -101520,7 +101520,7 @@ _02175e80: ; jump table _02175ea0: ldr r0, _021760dc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreqb r0, [r4, #0x25f] cmpeq r0, #0 @@ -102804,7 +102804,7 @@ func_ov15_0217708c: ; 0x0217708c mov r8, fp mov sb, fp mov sl, fp - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02177104 ldr r0, _02177200 ; =data_027e0c68 @@ -102869,13 +102869,13 @@ _02177198: ldr r0, _021771fc ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #1 bne _021771d0 ldr r0, _021771fc ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021771d4 _021771d0: @@ -103013,14 +103013,14 @@ func_ov15_02177330: ; 0x02177330 ldr r0, _021773a0 ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r4, #2 bne _02177390 ldr r0, _021773a0 ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r4, #1 bne _02177390 @@ -103322,13 +103322,13 @@ func_ov15_021776c4: ; 0x021776c4 ldr r0, _021777fc ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0217774c ldr r0, _021777fc ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02177774 _0217774c: @@ -103411,13 +103411,13 @@ func_ov15_02177808: ; 0x02177808 ldr r0, _02177948 ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02177890 ldr r0, _02177948 ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021778b8 _02177890: @@ -103630,7 +103630,7 @@ func_ov15_02177964: ; 0x02177964 strh r1, [r4, #0x7a] ldr r0, [r0] mov r1, #0xf8 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02177bd4 mov r0, r4 @@ -103647,7 +103647,7 @@ _02177bd4: ldr r0, _02177f0c ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02177c14 mov r0, r4 @@ -103994,7 +103994,7 @@ _021780c8: mov r1, #0xf8 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _02178140 ; =data_027e0c68 ldr r2, _02178144 ; =0x00050047 add r1, r7, #0x314 @@ -104125,7 +104125,7 @@ func_ov15_02178258: ; 0x02178258 ldr r0, _02178390 ; =gAdventureFlags ldr r1, [r4, #0x370] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _021782a4 ldr r0, [r4, #0x130] @@ -104570,13 +104570,13 @@ _02178910: ldr r0, _021789c0 ; =gAdventureFlags ldr r1, [r5, #0x370] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02178940 ldr r0, _021789c0 ; =gAdventureFlags ldr r1, [r5, #0x370] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02178940: mvn r2, #0 mov r0, r5 @@ -104702,7 +104702,7 @@ func_ov15_02178a6c: ; 0x02178a6c strb r1, [r4, #0x474] ldr r0, [r0] mov r1, #0x18 - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei add r0, r4, #0x3b4 bl func_ov00_020b7e6c ldr r0, _02178b6c ; =data_027e103c @@ -104860,7 +104860,7 @@ _02178cfc: ldr r0, _02178d70 ; =gAdventureFlags mov r1, #0x18 ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei mov r0, #1 strb r0, [r4, #0x46f] _02178d40: @@ -106854,7 +106854,7 @@ func_ov15_0217a850: ; 0x0217a850 strb r3, [sp, #0x10f] strb r2, [sp, #0x110] str fp, [sp, #0x114] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x370] add r0, sp, #0x80 bl func_ov00_0209a508 @@ -111147,7 +111147,7 @@ func_ov15_0217e368: ; 0x0217e368 mov r8, r4 mov sb, r4 mov sl, r4 - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0217e3d4 ldr r0, _0217e4a8 ; =data_027e0c68 @@ -111209,13 +111209,13 @@ _0217e460: ldr r0, _0217e4a4 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #1 bne _0217e498 ldr r0, _0217e4a4 ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0217e49c _0217e498: @@ -112384,7 +112384,7 @@ func_ov15_0217f47c: ; 0x0217f47c ldr r1, _0217f5d4 ; =data_ov15_0218e6f0 ldr r0, [r0] ldr r1, [r1, r4] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x18 moveq r0, #0 @@ -113332,7 +113332,7 @@ _02180078: ldr r0, _02180334 ; =gAdventureFlags mov r1, #0x1e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021800fc add sp, sp, #0x50 @@ -113342,7 +113342,7 @@ _0218009c: ldr r0, _02180334 ; =gAdventureFlags mov r1, #0x33 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021800fc add sp, sp, #0x50 @@ -113352,7 +113352,7 @@ _021800c0: ldr r0, _02180334 ; =gAdventureFlags mov r1, #0x33 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x50 moveq r0, sl @@ -113713,7 +113713,7 @@ _02180424: ldr r0, [r0] add r1, sp, #0x204 str r2, [sp, #0x22c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x38c] mov r1, #1 strb r1, [r5, #0x3a0] @@ -113954,7 +113954,7 @@ _021806b8: strb r3, [sp, #0x1e3] strb r2, [sp, #0x1e4] str fp, [sp, #0x1e8] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x38c] mov r0, #1 strb r0, [r5, #0x3a0] @@ -114021,7 +114021,7 @@ _02180a3c: ldr r0, [r0] add r1, sp, #0x3c str r2, [sp, #0x64] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x38c] mov r1, #1 add r0, sp, #0x3c @@ -114426,13 +114426,13 @@ _02180fc0: ldr r0, _0218137c ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181038 ldr r0, _0218137c ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02181038: add r0, sp, #0x64 bl func_ov00_0209a4f4 @@ -114455,7 +114455,7 @@ _02181038: str r5, [sp, #0x84] str r3, [sp, #0x88] str r2, [sp, #0x8c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x38c] mov r1, #0 add r0, sp, #0x64 @@ -114635,7 +114635,7 @@ _02181338: ldr r0, _0218137c ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 mov r0, r4 str r1, [r4, #0x38c] @@ -114788,7 +114788,7 @@ _021814f0: ldr r0, _02181570 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 mov r0, r4 str r1, [r4, #0x38c] @@ -115012,7 +115012,7 @@ func_ov15_02181618: ; 0x02181618 strb r3, [sp, #0xf7] strb r2, [sp, #0xf8] str fp, [sp, #0xfc] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x38c] cmp r0, r1 @@ -115250,7 +115250,7 @@ func_ov15_02181b5c: ; 0x02181b5c ldr r0, _02181c48 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02181c10 ldr r0, [r4, #0x38c] @@ -115266,7 +115266,7 @@ _02181c10: ldr r0, _02181c48 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r2, #0 mov r0, r4 mov r1, #2 @@ -115298,7 +115298,7 @@ func_ov15_02181c4c: ; 0x02181c4c ldmneia sp!, {r4, pc} ldr r0, _02181cb4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x38c] mov r0, #0 @@ -115796,7 +115796,7 @@ _02182140: strb r3, [sp, #0x130] str r2, [sp, #0x134] strb fp, [sp, #0xb6] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x38c] mov r1, #1 add r0, sp, #0xa0 @@ -115880,7 +115880,7 @@ _021824dc: ldr r0, _02182588 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x38c] b _02182548 @@ -115978,13 +115978,13 @@ _02182644: ldr r0, _021826a8 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0218268c ldr r0, _021826a8 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0218268c: mov r0, #0 strb r0, [r4, #0x118] @@ -116972,7 +116972,7 @@ _02183384: ldr r0, _02183568 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 add r0, sp, #0x68 str r1, [r4, #0x38c] @@ -117068,7 +117068,7 @@ _02183384: strb ip, [sp, #0xf7] strb r3, [sp, #0xf8] str r2, [sp, #0xfc] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x38c] cmp r0, r1 @@ -117781,7 +117781,7 @@ _02183de4: ldr r0, _021840f4 ; =gAdventureFlags mov r1, #0x15c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} diff --git a/asm/ov17.inc b/asm/ov17.inc index ed3bcb9e..391f2cbd 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -313,13 +313,13 @@ .extern func_ov00_02094824 .extern func_ov00_02094884 .extern func_ov00_020965c0 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bcc -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209cd9c diff --git a/asm/ov17.s b/asm/ov17.s index 00986a3a..4339f286 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -1354,7 +1354,7 @@ _0215c32c: str r2, [sp, #0x78] str r3, [sp, #0x7c] str r4, [sp, #0x80] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x6c] add r0, sp, #0x58 bl func_ov00_0209a508 @@ -7474,13 +7474,13 @@ _02161258: ldr r0, _021612a8 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _0216127c: ldr r0, _021612a8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xa ldmneia sp!, {r3, r4, r5, pc} ldr r0, _021612ac ; =data_027e0fc8 @@ -7582,7 +7582,7 @@ _02161334: str r2, [sp, #0x28] ldrb r2, [r5, #0x36] strb r2, [sp, #0x10] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x64] add r0, sp, #0 bl func_ov00_0209a508 @@ -7929,7 +7929,7 @@ _02161894: ldr r0, _02161914 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021618f4 ldrb r2, [r4, #0x15] @@ -8256,7 +8256,7 @@ func_ov17_02161c84: ; 0x02161c84 beq _02161cb0 ldr r0, _02161cc0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -8279,7 +8279,7 @@ func_ov17_02161cc4: ; 0x02161cc4 beq _02161cf0 ldr r0, _02161d00 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -8302,7 +8302,7 @@ func_ov17_02161d04: ; 0x02161d04 beq _02161d30 ldr r0, _02161d4c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -13131,7 +13131,7 @@ _02165858: ldr r0, _0216594c ; =gAdventureFlags ldr r1, [r5, #0x164] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02165930 ldr r0, [r5, #0x15c] @@ -13242,7 +13242,7 @@ _021659d4: ldr r0, _02165c20 ; =gAdventureFlags ldr r1, [r5, #0x164] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02165a34 ldr r0, [r5, #0x15c] @@ -13270,12 +13270,12 @@ _02165a34: ldr r0, _02165c20 ; =gAdventureFlags ldr r1, [r5, #0x164] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02165c00 ldr r0, _02165c20 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d bne _02165bf4 ldr r0, [r5, #0x15c] @@ -13476,7 +13476,7 @@ _02165ce4: str r2, [sp, #0x24] ldr r2, [r4, #0x50] str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x164] add r0, sp, #0 bl func_ov00_0209a508 @@ -13751,7 +13751,7 @@ _021660a0: beq _02166114 ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216610c mov r0, r4 @@ -13766,7 +13766,7 @@ _0216610c: _02166114: ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0216613c mov r0, r4 @@ -13793,7 +13793,7 @@ _0216614c: beq _021661a8 ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021661a0 mov r0, r4 @@ -13808,7 +13808,7 @@ _021661a0: _021661a8: ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _021661d0 mov r0, r4 @@ -15720,11 +15720,11 @@ _02167b30: ldr r0, _02167cc4 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv ldr r0, _02167cc4 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, pc} @@ -15793,7 +15793,7 @@ _02167bd4: _02167c48: ldr r0, _02167cc4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02167ca4 ldr r0, [r4, #0x48] @@ -15878,7 +15878,7 @@ _02167d1c: ldr r2, [r4, #0x20] str r2, [sp, #0x64] strb r3, [sp, #0x52] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x64] add r0, sp, #0x3c bl func_ov00_0209a508 @@ -18159,7 +18159,7 @@ func_ov17_02169a58: ; 0x02169a58 ldr r0, _02169b3c ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02169b08 ldr r0, _02169b40 ; =data_027e0fe4 @@ -18232,7 +18232,7 @@ _02169b74: beq _02169c98 ldr r0, _02169ca4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x64] b _02169c98 @@ -18295,7 +18295,7 @@ _02169c1c: ldr r2, [r4, #0x20] str r2, [r4, #0x78] ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x64] add r0, sp, #0 bl func_ov00_0209a508 @@ -18662,13 +18662,13 @@ func_ov17_0216a06c: ; 0x0216a06c ldr r0, _0216a0f4 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _0216a0cc: ldr r0, _0216a0f4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xa ldmneia sp!, {r3, r4, r5, pc} ldr r0, _0216a0f8 ; =data_027e0fc8 @@ -18769,7 +18769,7 @@ _0216a180: str r2, [sp, #0x28] ldrb r2, [r5, #0x36] strb r2, [sp, #0x10] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x64] add r0, sp, #0 bl func_ov00_0209a508 @@ -19107,7 +19107,7 @@ _0216a6b0: ldr r0, _0216a730 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0216a710 ldrb r2, [r4, #0x15] @@ -19531,12 +19531,12 @@ _0216ac6c: ldr r0, _0216ace8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _0216ace8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e ldmloia sp!, {r4, pc} mov r0, r4 @@ -19550,7 +19550,7 @@ _0216acb4: ldr r0, _0216ace8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -19630,7 +19630,7 @@ _0216ad7c: str r2, [sp, #0x3c] ldr r2, [r4, #0x20] str r2, [sp, #0x40] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x68] add r0, sp, #0x18 bl func_ov00_0209a508 diff --git a/asm/ov18.inc b/asm/ov18.inc index 5baac542..f2ebf242 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -334,14 +334,14 @@ .extern func_ov00_02093af0 .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc -.extern func_ov00_02097ff4 -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a5e9c diff --git a/asm/ov18.s b/asm/ov18.s index 34ddc178..e035336e 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -753,7 +753,7 @@ func_ov18_0215beb8: ; 0x0215beb8 bne _0215bf7c ldr r0, _0215bfbc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _0215bfc0 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -2678,12 +2678,12 @@ _0215d748: ldr r0, _0215daac ; =gAdventureFlags ldr r1, [r5, #0x168] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0215d788 ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x87 blo _0215d788 mov r0, r5 @@ -2705,7 +2705,7 @@ _0215d788: bne _0215d7dc ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x14 blo _0215d7dc mov r0, r5 @@ -2716,7 +2716,7 @@ _0215d788: _0215d7dc: ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev rsb r0, r0, #0x69 movs r1, r0, lsl #0xc movmi r1, #0 @@ -2744,12 +2744,12 @@ _0215d840: ldr r0, _0215daac ; =gAdventureFlags ldr r1, [r5, #0x168] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0215d9a8 ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d blo _0215d87c mov r0, r5 @@ -2759,7 +2759,7 @@ _0215d840: _0215d87c: ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev rsb r0, r0, #0xb4 movs r2, r0, lsl #0xc movmi r2, #0 @@ -2771,7 +2771,7 @@ _0215d8a4: ldr r0, _0215daac ; =gAdventureFlags ldr r1, [r5, #0x168] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0215d9a8 ldr r0, _0215daa0 ; =data_027e0d38 @@ -2800,7 +2800,7 @@ _0215d8ec: _0215d910: ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev rsb r0, r0, #0xb4 movs r2, r0, lsl #0xc movmi r2, #0 @@ -2809,7 +2809,7 @@ _0215d910: bl func_0202b308 ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x78 blo _0215d9a8 mov r0, r5 @@ -2831,7 +2831,7 @@ _0215d95c: _0215d984: ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev rsb r0, r0, #0xb4 movs r2, r0, lsl #0xc movmi r2, #0 @@ -3022,7 +3022,7 @@ _0215dbb0: strb lr, [sp, #0xc5] str r5, [sp, #0x15c] str r3, [sp, #0x144] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x168] ldrh r0, [r4, #0x78] ldr ip, _0215dea8 ; =data_02050f54 @@ -3106,7 +3106,7 @@ _0215dcf8: strb ip, [sp, #0x15] str r3, [sp, #0x94] str r2, [sp, #0xac] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x168] ldrsh r2, [r4, #0x78] ldr r0, _0215dea0 ; =data_ov00_020eec68 @@ -3141,7 +3141,7 @@ _0215de04: ldr r0, _0215dea4 ; =gAdventureFlags ldr r1, [r4, #0x168] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x168] mov r1, #0 @@ -4132,7 +4132,7 @@ _0215eb0c: mov r1, #0x1f strb r2, [r8] ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0215eb68 mov r0, #0 @@ -5340,7 +5340,7 @@ _0215fa7c: ldr r2, _0215fa90 ; =gAdventureFlags ldrh r1, [r0, #0x2a] ldr r0, [r2] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_0215fa64 @@ -9714,7 +9714,7 @@ _02163108: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r0, _02163254 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x20 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -10527,7 +10527,7 @@ _02163c98: ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r0, _02163d60 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreq r0, [r7, #4] biceq r0, r0, #1 @@ -11684,13 +11684,13 @@ func_ov18_02164bf0: ; 0x02164bf0 ldr r0, _02164c30 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164c28 ldr r0, _02164c30 ; =gAdventureFlags mov r1, #0x30 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11708,13 +11708,13 @@ func_ov18_02164c34: ; 0x02164c34 ldr r0, _02164c74 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164c6c ldr r0, _02164c74 ; =gAdventureFlags mov r1, #0x95 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11732,13 +11732,13 @@ func_ov18_02164c78: ; 0x02164c78 ldr r0, _02164cb8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164cb0 ldr r0, _02164cb8 ; =gAdventureFlags mov r1, #0x96 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11756,13 +11756,13 @@ func_ov18_02164cbc: ; 0x02164cbc ldr r0, _02164cfc ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164cf4 ldr r0, _02164cfc ; =gAdventureFlags mov r1, #0x97 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11780,13 +11780,13 @@ func_ov18_02164d00: ; 0x02164d00 ldr r0, _02164d40 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164d38 ldr r0, _02164d40 ; =gAdventureFlags mov r1, #0x98 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11804,13 +11804,13 @@ func_ov18_02164d44: ; 0x02164d44 ldr r0, _02164d84 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164d7c ldr r0, _02164d84 ; =gAdventureFlags mov r1, #0x94 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11828,13 +11828,13 @@ func_ov18_02164d88: ; 0x02164d88 ldr r0, _02164dc8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164dc0 ldr r0, _02164dc8 ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -11852,13 +11852,13 @@ func_ov18_02164dcc: ; 0x02164dcc ldr r0, _02164e20 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164e18 ldr r0, _02164e20 ; =gAdventureFlags mov r1, #0x2c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164e18 ldr r0, _02164e24 ; =data_027e0dbc @@ -11882,13 +11882,13 @@ func_ov18_02164e28: ; 0x02164e28 ldr r0, _02164e7c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164e74 ldr r0, _02164e7c ; =gAdventureFlags mov r1, #0x58 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164e74 ldr r0, _02164e80 ; =data_027e0dbc @@ -11912,13 +11912,13 @@ func_ov18_02164e84: ; 0x02164e84 ldr r0, _02164ed8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164ed0 ldr r0, _02164ed8 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164ed0 ldr r0, _02164edc ; =data_027e0dbc @@ -11942,19 +11942,19 @@ func_ov18_02164ee0: ; 0x02164ee0 ldr r0, _02164f4c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164f44 ldr r0, _02164f4c ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164f44 ldr r0, _02164f4c ; =gAdventureFlags mov r1, #0xb9 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164f44 ldr r0, _02164f50 ; =data_027e0dbc @@ -11978,13 +11978,13 @@ func_ov18_02164f54: ; 0x02164f54 ldr r0, _02164fa8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164fa0 ldr r0, _02164fa8 ; =gAdventureFlags mov r1, #0x7f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164fa0 ldr r0, _02164fac ; =data_027e0dbc @@ -12008,13 +12008,13 @@ func_ov18_02164fb0: ; 0x02164fb0 ldr r0, _02165004 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164ffc ldr r0, _02165004 ; =gAdventureFlags mov r1, #0x99 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02164ffc ldr r0, _02165008 ; =data_027e0dbc @@ -12038,13 +12038,13 @@ func_ov18_0216500c: ; 0x0216500c ldr r0, _0216504c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02165044 ldr r0, _0216504c ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12062,13 +12062,13 @@ func_ov18_02165050: ; 0x02165050 ldr r0, _021650a4 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216509c ldr r0, _021650a4 ; =gAdventureFlags mov r1, #0x9c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216509c ldr r0, _021650a8 ; =data_027e0dbc @@ -12092,13 +12092,13 @@ func_ov18_021650ac: ; 0x021650ac ldr r0, _021650ec ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021650e4 ldr r0, _021650ec ; =gAdventureFlags ldr r1, _021650f0 ; =0x00000123 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12117,13 +12117,13 @@ func_ov18_021650f4: ; 0x021650f4 ldr r0, _02165134 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216512c ldr r0, _02165134 ; =gAdventureFlags ldr r1, _02165138 ; =0x0000012a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12142,13 +12142,13 @@ func_ov18_0216513c: ; 0x0216513c ldr r0, _0216517c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02165174 ldr r0, _0216517c ; =gAdventureFlags ldr r1, _02165180 ; =0x0000012b ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12167,13 +12167,13 @@ func_ov18_02165184: ; 0x02165184 ldr r0, _021651c4 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021651bc ldr r0, _021651c4 ; =gAdventureFlags mov r1, #0x12c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12191,13 +12191,13 @@ func_ov18_021651c8: ; 0x021651c8 ldr r0, _02165208 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02165200 ldr r0, _02165208 ; =gAdventureFlags ldr r1, _0216520c ; =0x0000012d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12216,13 +12216,13 @@ func_ov18_02165210: ; 0x02165210 ldr r0, _02165250 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02165248 ldr r0, _02165250 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12240,13 +12240,13 @@ func_ov18_02165254: ; 0x02165254 ldr r0, _02165294 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216528c ldr r0, _02165294 ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -12264,13 +12264,13 @@ func_ov18_02165298: ; 0x02165298 ldr r0, _021652d8 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021652d0 ldr r0, _021652d8 ; =gAdventureFlags ldr r1, _021652dc ; =0x0000017b ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} @@ -12296,7 +12296,7 @@ _021652f8: cmp r1, r4 beq _02165314 ldr r0, [r5] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02165328 _02165314: @@ -12332,7 +12332,7 @@ _02165364: cmp r1, r4 beq _02165380 ldr r0, [r5] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02165398 _02165380: @@ -12446,7 +12446,7 @@ func_ov18_02165420: ; 0x02165420 ldr r0, _0216567c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreqh r0, [r4, #0x20] cmpeq r0, #1 @@ -12581,7 +12581,7 @@ func_ov18_02165690: ; 0x02165690 ldr r0, _021656e0 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _021656d0: mov r0, r4 bl func_ov18_021658fc @@ -13279,7 +13279,7 @@ func_ov18_02165e30: ; 0x02165e30 ldr r0, _02165f48 ; =gAdventureFlags mov r1, #0x8c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0x7e ldmneia sp!, {r4, pc} @@ -13422,7 +13422,7 @@ _021660ec: ldr r0, [r0] mov r3, r1 mov r2, #1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb ldr r0, _0216665c ; =data_027e103c ldr r0, [r0] bl func_ov05_02104114 @@ -13438,7 +13438,7 @@ _0216611c: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb mov r0, #0 strb r0, [r5, #0x51c] add sp, sp, #0x28 @@ -13605,7 +13605,7 @@ _02166388: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb mov r0, #5 str r0, [r5, #0x47c] mov r1, #0 @@ -14506,7 +14506,7 @@ func_ov18_02166f20: ; 0x02166f20 strh r0, [ip, #0x18] ldr r0, _02167060 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb add r0, r4, #0x14 add r3, sp, #0 ldmia r0, {r0, r1, r2} @@ -15349,7 +15349,7 @@ _02167bdc: ldr r0, [r0] mov r3, r1 mov r2, #1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb ldr r0, _02167df0 ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -15533,7 +15533,7 @@ func_ov18_02167e04: ; 0x02167e04 mov r1, #1 ldr r0, [r0] mov r2, r1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb mov r0, r4 mov r1, #1 bl _ZN5Actor10SetUnk_11cEc @@ -18494,7 +18494,7 @@ _0216a614: ldr r0, _0216a6ac ; =gAdventureFlags mov r1, #0x31 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x14] diff --git a/asm/ov19.inc b/asm/ov19.inc index f43a5b0d..f6b24b6d 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -231,13 +231,13 @@ .extern func_ov00_02093a3c .extern func_ov00_02093a4c .extern func_ov00_02094824 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209cbd4 diff --git a/asm/ov19.s b/asm/ov19.s index ac1bc646..aa0a43b9 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -179,7 +179,7 @@ func_ov19_0216d8f8: ; 0x0216d8f8 mov r4, r0 ldr r0, [r1] mov r1, #0x1e - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -1542,7 +1542,7 @@ func_ov19_0216eacc: ; 0x0216eacc ldr r0, [r1] mov r1, #0x1e mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0216eb2c ; =gItemManager mov r1, #0x16 ldr r0, [r0] @@ -2564,7 +2564,7 @@ _0216f828: ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _0216f938 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev str r0, [r5, #8] mov r0, r5 mov r1, #5 @@ -2576,7 +2576,7 @@ _0216f86c: bl func_ov19_0216dac8 ldr r0, _0216f938 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, [r5, #8] add r1, r1, #0x3c cmp r1, r0 @@ -2591,7 +2591,7 @@ _0216f86c: _0216f8ac: ldr r0, _0216f938 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev ldr r1, [r5, #8] add r1, r1, #0x4b cmp r1, r0 @@ -3780,7 +3780,7 @@ _02170870: ldr r0, _021708dc ; =gAdventureFlags mov r1, #7 ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei mov r0, r4 bl func_ov00_020cc960 mov r0, r4 @@ -6908,7 +6908,7 @@ _021730d0: str r2, [sp, #0x24] ldr r2, [r4, #0x20] str r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x64] add r0, sp, #0 bl func_ov00_0209a508 @@ -7349,7 +7349,7 @@ _0217369c: ldr r0, _0217378c ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _021736d4 mov r0, r4 @@ -7364,13 +7364,13 @@ _021736d4: ldr r0, _0217378c ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r4, pc} ldr r0, _0217378c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xa bne _02173714 ldr r0, _02173790 ; =data_027e0fc8 @@ -7380,7 +7380,7 @@ _021736d4: _02173714: ldr r0, _0217378c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #5 bne _0217373c ldr r0, _02173788 ; =data_027e0ffc @@ -7485,7 +7485,7 @@ _0217383c: strb r3, [sp, #9] strb r2, [sp, #0xa] strb r2, [sp, #0xb] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x68] add r0, sp, #0 bl func_ov00_0209a508 @@ -8390,7 +8390,7 @@ func_ov19_02174454: ; 0x02174454 ble _0217448c ldr r0, _02174548 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 addeq sp, sp, #0xc @@ -8402,7 +8402,7 @@ _0217448c: ble _021744b8 ldr r0, _02174548 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 addne sp, sp, #0xc diff --git a/asm/ov20.inc b/asm/ov20.inc index cd5a53fc..1386badf 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -218,13 +218,13 @@ .extern func_ov00_0208ccdc .extern func_ov00_0208cd0c .extern func_ov00_02094824 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc -.extern func_ov00_0209809c +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_0209809cEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov20.s b/asm/ov20.s index a43a644d..118c2bef 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -136,7 +136,7 @@ func_ov20_0216d848: ; 0x0216d848 mov sl, r0 ldr r0, [r1] mov r1, #0x1d - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x44 movne r0, #0 @@ -295,7 +295,7 @@ func_ov20_0216da64: ; 0x0216da64 mov r1, #0x1d ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0216dac0 ; =gItemManager mov r1, #0x15 ldr r0, [r0] @@ -2061,7 +2061,7 @@ _0216f42c: ldr r0, _0216f4b0 ; =gAdventureFlags mov r1, #6 ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei mov r0, r4 bl func_ov00_020cc960 mov r0, r4 @@ -6466,12 +6466,12 @@ _02172dd8: ldr r0, _02173018 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _02173018 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -6519,7 +6519,7 @@ _02172e54: beq _02172eb8 ldr r0, _02173018 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02172ed4 _02172eb8: @@ -6908,7 +6908,7 @@ _021732a8: strb ip, [sp, #0xf6] strb r3, [sp, #0xf7] strb r2, [sp, #0xf8] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x6c] add r0, sp, #0x68 bl func_ov00_0209a508 @@ -6955,7 +6955,7 @@ _021734c0: ldr r0, _02173564 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mov r1, #1 mvn r3, #0 mov r0, r4 @@ -6969,7 +6969,7 @@ _021734ec: ldr r0, _02173564 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x6c] _0217350c: @@ -6987,7 +6987,7 @@ _02173534: ldr r0, _02173564 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x6c] _0217354c: @@ -8072,7 +8072,7 @@ func_ov20_02174254: ; 0x02174254 beq _021742bc ldr r0, _02174308 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x118] @@ -9924,7 +9924,7 @@ _02175a54: str r5, [sp, #0x10c] str r3, [sp, #0x110] str r2, [sp, #0x114] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x158] add r0, sp, #0xec bl func_ov00_0209a508 @@ -9933,7 +9933,7 @@ _02175a54: _02175ae0: ldr r0, _02175f1c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x19c ldmeqia sp!, {r4, r5, pc} @@ -10210,7 +10210,7 @@ _02175ec8: ldr r0, _02175f1c ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mov r0, r4 bl _ZN5Actor4KillEv add sp, sp, #0x19c @@ -10513,7 +10513,7 @@ func_ov20_02176234: ; 0x02176234 ldr r0, _0217635c ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02176294 ldr r0, _02176360 ; =data_027e0f68 @@ -10567,7 +10567,7 @@ _021762c8: ldr r0, _0217635c ; =gAdventureFlags mov r1, #0x3f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x4d5] @@ -10732,7 +10732,7 @@ _021764d0: ldr r0, _021766a4 ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021764f8 ldr r0, [r4, #0x18] diff --git a/asm/ov22.inc b/asm/ov22.inc index c2c52eb2..2c895402 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -239,12 +239,12 @@ .extern func_ov00_02093af0 .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097c18 -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a6110 diff --git a/asm/ov22.s b/asm/ov22.s index cf8a5be5..c41ec659 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -1178,12 +1178,12 @@ _0216e614: ldr r0, _0216e770 ; =gAdventureFlags ldr r1, [r4, #0x70] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _0216e770 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d ldmloia sp!, {r4, pc} mov r0, r4 @@ -1241,12 +1241,12 @@ _0216e700: ldr r0, _0216e770 ; =gAdventureFlags ldr r1, [r4, #0x70] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _0216e770 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d ldmloia sp!, {r4, pc} mov r0, r4 @@ -1335,7 +1335,7 @@ _0216e7f0: ldr r0, [r0] add r1, sp, #0xd8 strb r2, [sp, #0xe8] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x70] add r0, sp, #0xd8 bl func_ov00_0209a508 @@ -1500,7 +1500,7 @@ _0216ea68: str r2, [sp, #0x48] str r3, [sp, #0x4c] str r5, [sp, #0x50] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x70] add r0, sp, #0x28 bl func_ov00_0209a508 @@ -2773,7 +2773,7 @@ _0216fb20: ldr r0, _0216fd5c ; =gAdventureFlags mov r1, #0x53 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216fbc4 add r1, sp, #0x50 @@ -2872,7 +2872,7 @@ _0216fca4: ldr r0, _0216fd5c ; =gAdventureFlags mov r1, #0x63 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216fcd0 mov r0, r4 @@ -4706,7 +4706,7 @@ func_ov22_021714b4: ; 0x021714b4 mov r4, r0 ldr r0, [r1] mov r1, #0x7d - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021714e4 mov r0, #0 @@ -9444,7 +9444,7 @@ func_ov22_02175238: ; 0x02175238 ldr r0, _02175340 ; =gAdventureFlags mov r1, #0xd ldr r0, [r0] - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -10322,7 +10322,7 @@ _02175da4: ldr r0, _02175e2c ; =gAdventureFlags ldr r1, [r4, #0x38] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02175dd8 mov r0, r4 @@ -10336,12 +10336,12 @@ _02175dd8: ldr r0, _02175e2c ; =gAdventureFlags ldr r1, [r4, #0x38] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _02175e2c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e ldmloia sp!, {r4, pc} add r0, r4, #0x3c @@ -10411,7 +10411,7 @@ _02175e80: add r1, sp, #0 str r3, [sp, #0x28] strb r2, [sp, #0x10] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x38] add r0, sp, #0 bl func_ov00_0209a508 @@ -13444,7 +13444,7 @@ func_ov22_0217843c: ; 0x0217843c ldr r0, _021784f4 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x118] @@ -13497,7 +13497,7 @@ func_ov22_021784f8: ; 0x021784f8 ldr r0, _021785b0 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x118] diff --git a/asm/ov23.inc b/asm/ov23.inc index cf893a1d..3e7cb074 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -284,14 +284,14 @@ .extern func_ov00_02094824 .extern func_ov00_02094884 .extern func_ov00_020965c0 -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bcc -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a41e4 diff --git a/asm/ov23.s b/asm/ov23.s index 1324c183..f18cb03e 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -5234,7 +5234,7 @@ _02171a38: _02171a94: ldr r0, _02172090 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02171b10 mov r0, #2 @@ -9402,7 +9402,7 @@ _02175270: str r3, [sp, #0x28] strb r2, [sp, #0x14] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x168] cmp r0, #0 bge _021752e4 @@ -9452,7 +9452,7 @@ func_ov23_02175350: ; 0x02175350 beq _02175378 ldr r0, _02175380 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -9524,7 +9524,7 @@ _02175440: beq _02175470 ldr r0, _02175710 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02175694 _02175470: @@ -9671,7 +9671,7 @@ _02175664: ldr r0, _02175710 ; =gAdventureFlags ldr r1, [r6, #0x168] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r6, #0x168] _02175694: @@ -9740,7 +9740,7 @@ _02175760: ldr r0, _02175870 ; =gAdventureFlags ldr r1, [r6, #0x168] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021757b4 ldrb r0, [r6, #0x11c] @@ -9752,7 +9752,7 @@ _02175760: ldr r0, _02175870 ; =gAdventureFlags ldr r1, [r6, #0x168] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r6, #0x168] _021757b4: @@ -10505,7 +10505,7 @@ func_ov23_02176100: ; 0x02176100 bne _0217614c ldr r0, _0217618c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _02176154 _0217614c: @@ -10615,7 +10615,7 @@ func_ov23_0217625c: ; 0x0217625c ldmgtia sp!, {r4, pc} ldr r0, _021763a4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x10 ldmneia sp!, {r4, pc} @@ -11045,7 +11045,7 @@ _02176870: ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _021768a8 mov r0, r4 @@ -11060,19 +11060,19 @@ _021768a8: ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} ldr r0, _02176a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d addlo sp, sp, #0xc ldmloia sp!, {r3, r4, pc} ldr r0, _02176a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d bne _02176904 ldr r0, _02176a2c ; =data_027e0ffc @@ -11114,7 +11114,7 @@ _02176974: ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _021769ac mov r0, r4 @@ -11129,13 +11129,13 @@ _021769ac: ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} ldr r0, _02176a28 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d addlo sp, sp, #0xc ldmloia sp!, {r3, r4, pc} @@ -11216,7 +11216,7 @@ _02176aa0: str r2, [sp, #0xe4] ldrb r2, [r4, #0x36] strb r2, [sp, #0xcc] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x64] add r0, sp, #0xbc bl func_ov00_0209a508 @@ -11260,7 +11260,7 @@ _02176b50: str r2, [sp, #0x30] ldr r2, [r4, #0x20] str r2, [sp, #0x34] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x64] add r0, sp, #0xc bl func_ov00_0209a508 @@ -11758,7 +11758,7 @@ _021771ac: ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _021771e4 mov r0, r4 @@ -11773,19 +11773,19 @@ _021771e4: ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e addlo sp, sp, #4 ldmloia sp!, {r3, r4, pc} ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e bne _0217724c mov r1, #4 @@ -11827,7 +11827,7 @@ _021772b0: ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} @@ -11857,7 +11857,7 @@ _02177320: ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02177358 mov r0, r4 @@ -11872,19 +11872,19 @@ _02177358: ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e addlo sp, sp, #4 ldmloia sp!, {r3, r4, pc} ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e bne _021773c0 mov r1, #4 @@ -11926,7 +11926,7 @@ _02177424: ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} @@ -12007,7 +12007,7 @@ _021774dc: add r1, sp, #0xb0 str r3, [sp, #0xd8] strb r2, [sp, #0xc0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x44] add r0, sp, #0xb0 bl func_ov00_0209a508 @@ -12062,7 +12062,7 @@ _021775c0: add r1, sp, #0 str r3, [sp, #0x28] strb r2, [sp, #0x10] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x44] add r0, sp, #0 bl func_ov00_0209a508 @@ -12960,12 +12960,12 @@ _021780ec: _021780f4: ldr r0, _02178160 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0217811c ldr r0, _02178160 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 beq _02178124 _0217811c: diff --git a/asm/ov24.inc b/asm/ov24.inc index 89b2c3d2..6a98780b 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -223,11 +223,11 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bbc -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov24.s b/asm/ov24.s index b2c3e44a..40826ea2 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -781,7 +781,7 @@ _0216e070: bne _0216e0a0 ldr r0, _0216e178 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _0216e16c _0216e0a0: @@ -804,7 +804,7 @@ _0216e0c4: bne _0216e0f4 ldr r0, _0216e178 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _0216e16c _0216e0f4: @@ -821,7 +821,7 @@ _0216e118: ldr r0, _0216e178 ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _0216e16c mov r1, #0 @@ -833,7 +833,7 @@ _0216e144: ldr r0, _0216e178 ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _0216e16c mov r0, r4 @@ -889,17 +889,17 @@ _0216e1f8: ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0216e42c ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d blo _0216e280 ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d bne _0216e258 ldr r1, _0216e4a0 ; =data_027e0f64 @@ -955,7 +955,7 @@ _0216e2ec: ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _0216e42c mov r1, #0 @@ -967,17 +967,17 @@ _0216e318: ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0216e42c ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d blo _0216e3a0 ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d bne _0216e378 ldr r1, _0216e4a0 ; =data_027e0f64 @@ -1030,7 +1030,7 @@ _0216e404: ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _0216e42c mov r0, r4 @@ -1169,7 +1169,7 @@ _0216e5bc: ldr r0, [r0] add r1, sp, #0xb0 strb r2, [sp, #0xc0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x170] add r0, sp, #0xb0 bl func_ov00_0209a508 @@ -1211,7 +1211,7 @@ _0216e644: moveq r2, #0 ldr r0, [r0] strb r2, [sp, #0x10] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x170] mov r1, #0 add r0, sp, #0 @@ -2814,7 +2814,7 @@ func_ov24_0216fa3c: ; 0x0216fa3c strb r2, [sp, #0x16] strb r2, [sp, #0x17] strb r2, [sp, #0x1c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mov r1, #0 str r1, [r4, #0x6c] ldr r0, _0216fbc8 ; =data_027e0fe4 @@ -13738,13 +13738,13 @@ _021789c8: ldr r0, _02178a9c ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _02178a9c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e addlo sp, sp, #8 ldmloia sp!, {r3, r4, r5, pc} @@ -13866,7 +13866,7 @@ _02178b48: str r2, [sp, #0x30] ldrb r2, [r4, #0x36] strb r2, [sp, #0x18] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x68] add r0, sp, #8 bl func_ov00_0209a508 diff --git a/asm/ov25.inc b/asm/ov25.inc index 41f96a05..a0af2e7c 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -207,15 +207,15 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bcc -.extern func_ov00_02098074 -.extern func_ov00_020980ac +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib +.extern _ZN14AdventureFlags18func_ov00_020980acEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a956c diff --git a/asm/ov25.s b/asm/ov25.s index b31cbdd1..d0ce91a4 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -94,7 +94,7 @@ _0216d734: mov r1, #0x150 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 @@ -573,7 +573,7 @@ func_ov25_0216de38: ; 0x0216de38 mov r4, r0 ldr r0, [r1] mov r1, #0x35 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216de80 ldrh r0, [r4, #0x20] @@ -2980,7 +2980,7 @@ _0216feb0: ldr r0, [r0] mov r3, r1 mov r2, #0x1e - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib _0216fed0: add sp, sp, #0x80 ldmia sp!, {r4, r5, r6, pc} @@ -3927,7 +3927,7 @@ _02170bf0: ldr r0, [r0] mov r1, #0x35 mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 mov r1, #0x19 bl func_ov25_0216f898 @@ -3959,7 +3959,7 @@ _02170cb8: bl func_ov00_020bb810 ldr r0, _02170d68 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_020980ac + bl _ZN14AdventureFlags18func_ov00_020980acEv cmp r0, #0 beq _02170d10 ldr r0, _02170d6c ; =data_027e0f64 @@ -6510,7 +6510,7 @@ _02172e74: str r1, [r5, #0x414] ldr r0, [r0] mov r1, #0x3e - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02172eb8 mov r0, r5 @@ -6532,7 +6532,7 @@ _02172eb8: ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x23 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, r5 beq _02172f2c @@ -6557,7 +6557,7 @@ _02172f34: ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x25 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02172fa4 mvn r1, #0 @@ -6586,7 +6586,7 @@ _02172fa4: ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x26 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02173014 mvn r1, #0 @@ -6615,7 +6615,7 @@ _02173014: ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x34 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02173210 mvn r1, #0 @@ -6658,7 +6658,7 @@ _021730b0: ldr r0, _0217322c ; =gAdventureFlags mov r1, r4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, r5 beq _021730dc @@ -7574,7 +7574,7 @@ _02173c58: mov r1, #0x150 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173c9c: add r0, r4, #0x1d8 @@ -7587,7 +7587,7 @@ _02173c9c: mov r1, #0x150 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173ccc: add r0, r4, #0x1d8 @@ -7606,7 +7606,7 @@ _02173ccc: mov r1, #0x150 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173d14: add r0, r4, #0x1d8 @@ -7625,7 +7625,7 @@ _02173d14: mov r1, #0x150 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173d5c: add r0, r4, #0x1d8 @@ -7650,7 +7650,7 @@ _02173d5c: ldr r0, _0217401c ; =gAdventureFlags strb r2, [r4, #0x285] ldr r0, [r0] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173dbc: add r0, r4, #0x1d8 @@ -7744,7 +7744,7 @@ _02173e74: strb r2, [r4, #0x285] ldr r0, [r0] mov r1, #0x150 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173f0c: ldr r0, _02174034 ; =data_027e0c68 @@ -7781,7 +7781,7 @@ _02173f0c: strb r2, [r4, #0x285] ldr r0, [r0] mov r1, #0x150 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r4, r5, r6, pc} _02173f9c: bl func_ov25_02175464 @@ -7948,14 +7948,14 @@ _0217419c: ldr r0, _02175074 ; =gAdventureFlags ldr r1, _02175078 ; =0x00000152 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _021741e8 ldr r0, _02175074 ; =gAdventureFlags ldr r1, _02175078 ; =0x00000152 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 mov r1, #0x11 bl func_ov25_02173ab4 @@ -8040,7 +8040,7 @@ _021742f4: ldr r0, _02175074 ; =gAdventureFlags mov r1, r5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02175114 ldrh r0, [r4, #0x20] @@ -8807,21 +8807,21 @@ _02174e4c: mov r1, #0x25 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _02174e90 _02174e64: ldr r0, _02175074 ; =gAdventureFlags mov r1, #0x26 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _02174e90 _02174e7c: ldr r0, _02175074 ; =gAdventureFlags mov r1, #0x34 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _02174e90: mov r0, r4 mov r1, #0 @@ -8840,7 +8840,7 @@ _02174e90: mov r1, #0x150 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 mov r1, #0x15 bl func_ov25_02173ab4 @@ -9220,7 +9220,7 @@ func_ov25_0217540c: ; 0x0217540c ldr r2, _02175428 ; =gAdventureFlags mov r4, r0 ldr r0, [r2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x580] ldmia sp!, {r4, pc} .align 2, 0 @@ -9244,13 +9244,13 @@ func_ov25_02175444: ; 0x02175444 ldr r1, _0217545c ; =gAdventureFlags mov r2, r0 ldr r0, [r1] - ldr ip, _02175460 ; =func_ov00_02097b9c + ldr ip, _02175460 ; =_ZN14AdventureFlags18func_ov00_02097b9cEv ldr r1, [r2, #0x580] bx ip .align 2, 0 arm_func_end func_ov25_02175444 _0217545c: .word gAdventureFlags -_02175460: .word func_ov00_02097b9c +_02175460: .word _ZN14AdventureFlags18func_ov00_02097b9cEv .global func_ov25_02175464 arm_func_start func_ov25_02175464 @@ -9258,13 +9258,13 @@ func_ov25_02175464: ; 0x02175464 ldr r1, _0217547c ; =gAdventureFlags mov r2, r0 ldr r0, [r1] - ldr ip, _02175480 ; =func_ov00_02097bcc + ldr ip, _02175480 ; =_ZN14AdventureFlags18func_ov00_02097bccEv ldr r1, [r2, #0x580] bx ip .align 2, 0 arm_func_end func_ov25_02175464 _0217547c: .word gAdventureFlags -_02175480: .word func_ov00_02097bcc +_02175480: .word _ZN14AdventureFlags18func_ov00_02097bccEv .global func_ov25_02175484 arm_func_start func_ov25_02175484 @@ -9274,12 +9274,12 @@ func_ov25_02175484: ; 0x02175484 mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x580] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _021754bc ldr r0, _021754c4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} @@ -10228,7 +10228,7 @@ _021760ec: strb r3, [sp, #0x96] strb r3, [sp, #0x97] strb r2, [sp, #0xa3] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1d0] add r0, sp, #0x8c bl func_ov00_0209a508 @@ -10259,7 +10259,7 @@ _02176178: ldr r0, [r0] mov r3, r1 mov r2, #0x1e - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib mov r2, #0 ldr r0, _02176348 ; =data_027e0db0 mov r3, r2 @@ -10324,14 +10324,14 @@ _02176274: ldr r0, [r0] mov r3, r1 mov r2, #0x1e - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib add sp, sp, #0x13c ldmia sp!, {r4, r5, r6, r7, pc} _021762a0: ldr r0, _02176338 ; =gAdventureFlags ldr r1, [r4, #0x1d0] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv add sp, sp, #0x13c ldmia sp!, {r4, r5, r6, r7, pc} _021762b8: @@ -10482,7 +10482,7 @@ _02176480: ldr r0, _02176958 ; =gAdventureFlags ldr r1, [r4, #0x1d0] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} @@ -10566,7 +10566,7 @@ _02176588: _021765b8: ldr r0, _02176958 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_020980ac + bl _ZN14AdventureFlags18func_ov00_020980acEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} @@ -10588,7 +10588,7 @@ _021765e4: _02176608: ldr r0, _02176958 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_020980ac + bl _ZN14AdventureFlags18func_ov00_020980acEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} @@ -10606,13 +10606,13 @@ _02176648: ldr r0, _02176958 ; =gAdventureFlags ldr r1, [r4, #0x1d0] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} ldr r0, _02176958 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x24 ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc} @@ -10840,7 +10840,7 @@ func_ov25_0217696c: ; 0x0217696c mov r4, r1 ldr r0, [r0] ldr r1, [r5, #0x1d0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021769a0 mov r0, r5 diff --git a/asm/ov26.inc b/asm/ov26.inc index 1610925b..48fbba7f 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -276,17 +276,17 @@ .extern func_ov00_02093af0 .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bcc -.extern func_ov00_02097c18 -.extern func_ov00_02098058 -.extern func_ov00_02098074 -.extern func_ov00_0209809c +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib +.extern _ZN14AdventureFlags18func_ov00_0209809cEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209d8d8 diff --git a/asm/ov26.s b/asm/ov26.s index 5dcdf16c..c1971722 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -1305,14 +1305,14 @@ func_ov26_0216e4c0: ; 0x0216e4c0 arm_func_start func_ov26_0216e4d0 func_ov26_0216e4d0: ; 0x0216e4d0 ldr r0, _0216e4e4 ; =gAdventureFlags - ldr ip, _0216e4e8 ; =func_ov00_02097760 + ldr ip, _0216e4e8 ; =_ZN14AdventureFlags3GetEj mov r1, #0x11 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov26_0216e4d0 _0216e4e4: .word gAdventureFlags -_0216e4e8: .word func_ov00_02097760 +_0216e4e8: .word _ZN14AdventureFlags3GetEj .global func_ov26_0216e4ec thumb_func_start func_ov26_0216e4ec @@ -1952,7 +1952,7 @@ _0216ebec: bgt _0216ec8c ldr r0, _0216eca4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _0216ec8c ldr r0, _0216eca8 ; =data_027e071c @@ -4687,7 +4687,7 @@ _02171020: _0217103c: ldr r0, _02171740 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d bne _02171718 mov r0, r5 @@ -5651,7 +5651,7 @@ _02171d8c: ldr r0, [r0] ldr r1, [r1, r2, lsl #2] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _02171dc0 _02171db8: mov r0, #0xf @@ -5718,7 +5718,7 @@ func_ov26_02171e4c: ; 0x02171e4c ldr r1, _02171e90 ; =data_ov26_0217944c ldr r0, [r0] ldr r1, [r1, r2, lsl #2] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -6350,7 +6350,7 @@ _02172698: str r2, [sp, #0x28] ldrb r2, [r4, #0x36] strb r2, [sp, #0x10] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x64] add r0, sp, #0 bl func_ov00_0209a508 @@ -6372,7 +6372,7 @@ _0217271c: ldr r0, _021727a8 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x64] _0217273c: @@ -6871,7 +6871,7 @@ _02172d60: ; jump table _02172d8c: ldr r0, _02172fb8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -7082,7 +7082,7 @@ _02173010: ldr r0, _021732ac ; =gAdventureFlags mov r3, r2 ldr r0, [r0] - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib mvn r0, #0 str r0, [sp] mov r0, #2 @@ -7137,7 +7137,7 @@ _02173130: ldr r0, [r0] mov r2, r1 mov r3, r1 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib b _02173288 _02173160: mov r1, #0 @@ -7169,7 +7169,7 @@ _021731b8: mov r1, #0x82 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _021732bc ; =gItemManager mov r1, #0x60 ldr r0, [r0] @@ -7189,7 +7189,7 @@ _021731b8: strb r2, [sp, #0x18] strb r2, [sp, #0x19] strb r2, [sp, #0x22] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x6c] add r0, sp, #0xc bl func_ov00_0209a508 @@ -7211,7 +7211,7 @@ _02173260: ldr r0, _021732ac ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 ldr r0, _021732c8 ; =data_027e1054 str r1, [r4, #0x6c] @@ -7293,7 +7293,7 @@ func_ov26_02173350: ; 0x02173350 mov r4, r0 ldr r0, [r1] mov r1, #0x82 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreq r0, _021733ac ; =data_027e0618 ldreqb r0, [r0, #0x101] @@ -7614,7 +7614,7 @@ func_ov26_02173758: ; 0x02173758 bne _021737b4 ldr r0, _021737d4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _021737b4 mov r1, #0 @@ -7777,7 +7777,7 @@ func_ov26_02173944: ; 0x02173944 beq _02173988 ldr r0, _02173ab4 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0217398c _02173988: @@ -9515,7 +9515,7 @@ _021749e4: ; jump table _02174a18: ldr r0, _02174ca0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 bne _02174c48 mov r0, r6 @@ -9764,7 +9764,7 @@ _02174d14: str r1, [sp, #4] ldr r0, [r0] mov r3, r2 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib mvn r0, #0 str r0, [sp] mov r0, #2 @@ -9797,7 +9797,7 @@ _02174d14: ldr r0, _02174fec ; =gAdventureFlags add r1, sp, #0xc ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x68] add r0, sp, #0xc bl func_ov00_0209a508 @@ -9847,7 +9847,7 @@ _02174ea4: ldr r0, _02174fec ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 ldr r0, _02174ff8 ; =data_027e1048 str r1, [r4, #0x68] @@ -9883,7 +9883,7 @@ _02174f58: ldr r0, _02174fec ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 ldr r0, _02174ff8 ; =data_027e1048 str r1, [r4, #0x68] @@ -10069,7 +10069,7 @@ func_ov26_02175194: ; 0x02175194 beq _021751c0 ldr r0, _021751ec ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -13295,7 +13295,7 @@ func_ov26_021778e8: ; 0x021778e8 mov r1, #0x82 str r2, [sp, #4] rsb r6, r2, #0xc0 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021779ac bl func_ov26_02177880 @@ -13411,7 +13411,7 @@ func_ov26_02177a98: ; 0x02177a98 mov r5, r0 ldr r0, [r1] mov r1, #0x16 - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -14480,12 +14480,12 @@ _021787b4: ldr r0, _02178980 ; =gAdventureFlags ldr r1, [r5, #0x40] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02178968 ldr r0, _02178980 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xf bne _021787e8 bl func_ov26_02178994 @@ -14493,7 +14493,7 @@ _021787b4: _021787e8: ldr r0, _02178980 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x3c blo _02178968 mov r0, r5 @@ -14582,7 +14582,7 @@ _02178938: ldr r0, _02178980 ; =gAdventureFlags ldr r1, [r5, #0x40] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02178968 mov r0, r5 @@ -14659,7 +14659,7 @@ _021789e0: str ip, [sp, #0x3c] str r3, [sp, #0x40] strb r2, [sp, #0x28] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x40] mov lr, #0 str lr, [r4, #0x44] @@ -15262,7 +15262,7 @@ func_ov26_02179114: ; 0x02179114 ldr r0, _0217923c ; =gAdventureFlags mov r1, #0xc9 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreq r0, [r4, #4] biceq r0, r0, #1 diff --git a/asm/ov27.inc b/asm/ov27.inc index cceab3bf..e0630bb2 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -206,12 +206,12 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov27.s b/asm/ov27.s index 0a80b4d4..58305df4 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -133,7 +133,7 @@ func_ov27_0216d810: ; 0x0216d810 mov r4, r0 ldr r0, [r1] mov r1, #0x62 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x38 moveq r0, #0 @@ -141,13 +141,13 @@ func_ov27_0216d810: ; 0x0216d810 ldr r0, _0216da0c ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0216d86c ldr r0, _0216da0c ; =gAdventureFlags ldr r1, _0216da10 ; =0x00000186 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216d878 _0216d86c: @@ -158,7 +158,7 @@ _0216d878: ldr r0, _0216da0c ; =gAdventureFlags mov r1, #0xf4 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 movne r0, #1 @@ -407,7 +407,7 @@ _0216db58: str r1, [sp, #0x70] str r1, [sp, #0x37c] add r1, sp, #0x354 - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x1b4] add r0, sp, #0x354 bl func_ov00_0209a508 @@ -416,7 +416,7 @@ _0216dc58: ldr r0, _0216e928 ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r5, #0x1b4] mov r1, #5 @@ -820,7 +820,7 @@ _0216e204: str r6, [sp, #0x2cc] strb r3, [sp, #0x2b8] strb r2, [sp, #0x2ba] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x1b4] mov r0, r5 mov r1, #0xd @@ -962,7 +962,7 @@ _0216e2b8: strb r3, [sp, #0x283] strb r2, [sp, #0x284] strb fp, [sp, #0x20a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x488] add r0, sp, #0x1f4 bl func_ov00_0209a508 @@ -1099,7 +1099,7 @@ _0216e4f4: strb r3, [sp, #0x16b] strb r2, [sp, #0x16c] strb lr, [sp, #0xf2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x1b4] ldr r0, _0216e920 ; =data_027e0c68 ldr r2, _0216e974 ; =0x00060009 @@ -1174,7 +1174,7 @@ _0216e7c4: ldr r0, _0216e928 ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 mov r0, r5 str r1, [r5, #0x1b4] @@ -1545,7 +1545,7 @@ _0216eb54: strb ip, [sp, #0x10f] strb r3, [sp, #0x110] strb r2, [sp, #0x96] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei add r1, r4, #0x88 str r0, [r4, #0x1b4] mov r0, r4 @@ -1854,7 +1854,7 @@ _0216f0f0: ldr r0, _0216f340 ; =gAdventureFlags mov r1, #0x51 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216f1c4 ldrsh r0, [r6, #0x78] @@ -3636,7 +3636,7 @@ _02170978: str ip, [sp, #0x34] strb r3, [sp, #0x20] strb r2, [sp, #0x22] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x488] mov r0, r4 add r1, r4, #0x1b4 @@ -4577,13 +4577,13 @@ func_ov27_021716ec: ; 0x021716ec mov r4, r1 ldr r0, [r0] ldr r1, [r4] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _02171728 ; =gAdventureFlags ldr r1, [r4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4] ldmia sp!, {r4, pc} @@ -4710,7 +4710,7 @@ func_ov27_0217184c: ; 0x0217184c str r5, [sp, #0xa8] strb r3, [sp, #0x94] strb r2, [sp, #0x96] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x1b4] cmp r0, r1 @@ -4835,7 +4835,7 @@ _021718e0: strb ip, [sp, #0x10f] strb r3, [sp, #0x110] strb r2, [sp, #0x96] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x488] cmp r0, r1 @@ -5240,7 +5240,7 @@ func_ov27_02171f3c: ; 0x02171f3c str r5, [sp, #0x7c] str r3, [sp, #0x80] str r2, [sp, #0x84] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj add r0, sp, #0x7c str r0, [sp] mov r1, #4 @@ -5286,7 +5286,7 @@ _02172018: str r5, [sp, #0x70] str r3, [sp, #0x74] str r2, [sp, #0x78] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj add r0, sp, #0x70 str r0, [sp] mov r1, #2 @@ -6099,7 +6099,7 @@ _02172c40: ldr r0, _02172ce0 ; =gAdventureFlags mov r1, #0xc7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} @@ -6276,7 +6276,7 @@ func_ov27_02172e1c: ; 0x02172e1c mov r1, #0x81 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _02172e64: add r0, r4, #0x11c add r0, r0, #0x400 @@ -6318,7 +6318,7 @@ func_ov27_02172ea8: ; 0x02172ea8 mov r1, #0x81 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _02172ef0: add r0, r4, #0x11c add r0, r0, #0x400 @@ -6360,7 +6360,7 @@ func_ov27_02172f48: ; 0x02172f48 mov r4, r0 ldr r0, [r1] ldr r1, _0217310c ; =0x00000186 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x2c movne r0, #0 @@ -6368,13 +6368,13 @@ func_ov27_02172f48: ; 0x02172f48 ldr r0, _02173108 ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02172fac ldr r0, _02173108 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addeq sp, sp, #0x2c moveq r0, #0 @@ -6383,7 +6383,7 @@ _02172fac: ldr r0, _02173108 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 moveq r0, #1 @@ -6922,7 +6922,7 @@ func_ov27_02173710: ; 0x02173710 ldmneia sp!, {r4, pc} ldr r0, _021737ac ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -8141,7 +8141,7 @@ func_ov27_02174454: ; 0x02174454 strb r2, [sp, #0x104] strb fp, [sp, #0x88] strb r7, [sp, #0x8a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] add r0, sp, #0x74 bl func_ov00_0209a508 @@ -8252,13 +8252,13 @@ func_ov27_021747d4: ; 0x021747d4 ldr r0, _021748dc ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02174860 ldr r0, _021748dc ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02174860: mvn r0, #0 str r0, [r5, #0x1b4] @@ -8595,7 +8595,7 @@ _02174c30: ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d30 ; =0x0000013e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -8608,7 +8608,7 @@ _02174c68: ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d34 ; =0x0000013f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, pc} @@ -8621,7 +8621,7 @@ _02174c98: ldr r0, _02174d2c ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #2 ldmeqia sp!, {r3, r4, r5, pc} @@ -8629,21 +8629,21 @@ _02174cc8: ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d30 ; =0x0000013e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #3 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d34 ; =0x0000013f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #4 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _02174d2c ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #5 moveq r0, #6 @@ -9313,7 +9313,7 @@ func_ov27_02175570: ; 0x02175570 ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xab ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x4e3] @@ -9321,7 +9321,7 @@ func_ov27_02175570: ; 0x02175570 ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xac ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 streqb r0, [r4, #0x4e3] @@ -9329,7 +9329,7 @@ func_ov27_02175570: ; 0x02175570 ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xad ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #2 streqb r0, [r4, #0x4e3] @@ -9337,7 +9337,7 @@ func_ov27_02175570: ; 0x02175570 ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xae ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #3 streqb r0, [r4, #0x4e3] @@ -10380,7 +10380,7 @@ _02176294: strb ip, [sp, #0xf8] str r3, [sp, #0xfc] strb r2, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] ldr r0, _02176438 ; =data_027e0c68 ldr r2, _02176448 ; =0x00060025 @@ -10518,7 +10518,7 @@ _02176494: strb ip, [sp, #0xf8] str r3, [sp, #0xfc] strb r2, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] ldr r0, _02176724 ; =data_027e0c68 ldr r2, _02176728 ; =0x00060025 @@ -10653,13 +10653,13 @@ func_ov27_021767a8: ; 0x021767a8 ldr r0, _021769e8 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021767ec ldr r0, _021769e8 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021767ec: mvn r0, #0 str r0, [r4, #0x1b4] @@ -10771,7 +10771,7 @@ _021767ec: strb lr, [sp, #0xf8] str ip, [sp, #0xfc] strb r3, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] mov r0, #0 strb r0, [r4, #0x1ac] @@ -10817,13 +10817,13 @@ func_ov27_02176a00: ; 0x02176a00 ldr r0, _02176aa4 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02176a5c ldr r0, _02176aa4 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02176a5c: mvn r0, #0 str r0, [r4, #0x1b4] @@ -11555,13 +11555,13 @@ _02177460: ldr r0, _02177680 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02177664 ldr r0, _02177680 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x1b4] add sp, sp, #0x118 @@ -11675,7 +11675,7 @@ _0217749c: ldr r0, [r0] add r1, sp, #0x68 strb r2, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x1b4] add r0, sp, #0x68 bl func_ov00_0209a508 @@ -12496,7 +12496,7 @@ func_ov27_0217804c: ; 0x0217804c ldr r0, _02178194 ; =gAdventureFlags mov r1, #0xe8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02178150 mov r0, #1 @@ -13056,7 +13056,7 @@ func_ov27_02178870: ; 0x02178870 ldr r0, _021788b0 ; =gAdventureFlags mov r1, #0xe8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 movne r0, #0 diff --git a/asm/ov28.inc b/asm/ov28.inc index dfdefd3c..b0b44d2c 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -219,14 +219,14 @@ .extern func_ov00_02093af0 .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern func_ov00_02097738 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc -.extern func_ov00_02097ff4 -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a956c diff --git a/asm/ov28.s b/asm/ov28.s index 12d5dda3..de1104f6 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -165,7 +165,7 @@ func_ov28_0216d6e0: ; 0x0216d6e0 str r4, [r1, #0x20] ldr r0, [r0] mov r1, #0x57 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -187,12 +187,12 @@ func_ov28_0216d90c: ; 0x0216d90c ldr r0, [r0] mov r1, #0x56 mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0216d9dc ; =gAdventureFlags mov r1, #0x57 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r1, _0216d9e0 ; =data_ov28_02179b00 mov r2, #0 add r0, r4, #0x830 @@ -247,12 +247,12 @@ func_ov28_0216d9e4: ; 0x0216d9e4 ldr r0, [r0] mov r1, #0x56 mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0216dabc ; =gAdventureFlags mov r1, #0x57 ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r1, _0216dac0 ; =data_ov28_02179b00 mov r2, #0 add r0, r4, #0x830 @@ -546,13 +546,13 @@ func_ov28_0216dce8: ; 0x0216dce8 strb r1, [r4, #0x8e7] ldr r0, [r0] mov r1, #0x56 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0216de78 ldr r0, _0216dec4 ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216de94 _0216de78: @@ -589,7 +589,7 @@ func_ov28_0216dec8: ; 0x0216dec8 mov r4, r0 ldr r0, [r1] mov r1, #0x57 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0216def8 ldrb r0, [r4, #0x478] @@ -1480,7 +1480,7 @@ func_ov28_0216ead4: ; 0x0216ead4 strleb r0, [r5, #0x8e8] ldr r0, _0216eebc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #0 strneb r0, [r5, #0x285] @@ -2575,14 +2575,14 @@ func_ov28_0216f918: ; 0x0216f918 ldr r0, _0216fb30 ; =gAdventureFlags ldr r1, _0216fb34 ; =0x00000176 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0216f964 ldr r0, _0216fb30 ; =gAdventureFlags ldr r1, _0216fb34 ; =0x00000176 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r4, #0x29 b _0216fad8 _0216f964: @@ -3019,7 +3019,7 @@ _0216febc: ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffbc ; =0x0000013e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -3032,7 +3032,7 @@ _0216fef4: ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffc0 ; =0x0000013f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, pc} @@ -3045,7 +3045,7 @@ _0216ff24: ldr r0, _0216ffb8 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #2 ldmeqia sp!, {r3, r4, r5, pc} @@ -3053,21 +3053,21 @@ _0216ff54: ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffbc ; =0x0000013e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #3 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffc0 ; =0x0000013f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #4 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _0216ffb8 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #5 moveq r0, #6 @@ -3503,13 +3503,13 @@ func_ov28_021704b0: ; 0x021704b0 ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170628 ; =0x00000126 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02170524 ldr r0, _02170624 ; =gAdventureFlags ldr r1, _0217062c ; =0x0000012a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02170524 ldr r0, _02170630 ; =data_027e0e60 @@ -3523,13 +3523,13 @@ _02170524: ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170634 ; =0x00000127 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02170570 ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170638 ; =0x0000012b ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02170570 ldr r0, _02170630 ; =data_027e0e60 @@ -3543,13 +3543,13 @@ _02170570: ldr r0, _02170624 ; =gAdventureFlags mov r1, #0x128 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _021705bc ldr r0, _02170624 ; =gAdventureFlags mov r1, #0x12c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021705bc ldr r0, _02170630 ; =data_027e0e60 @@ -3563,13 +3563,13 @@ _021705bc: ldr r0, _02170624 ; =gAdventureFlags ldr r1, _0217063c ; =0x00000129 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02170604 ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170640 ; =0x0000012d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02170604 ldr r0, _02170630 ; =data_027e0e60 @@ -4761,7 +4761,7 @@ func_ov28_021713c8: ; 0x021713c8 mov r1, #0 ldr r0, [r0] mov r3, r1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb ldr r0, _02171484 ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -4992,7 +4992,7 @@ _021716f8: ldmneia sp!, {r4, pc} ldr r0, _021718c0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _021718c4 ; =data_027e077c ldreq r1, [r0] @@ -5050,7 +5050,7 @@ _021716f8: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb mov r0, #0xa000 str r0, [sp] mov r0, #0xa800 @@ -5080,7 +5080,7 @@ _02171858: mov r1, #0 ldr r0, [r0] mov r3, r1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb ldr r0, _021718d4 ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -5141,7 +5141,7 @@ _0217192c: ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a2c ; =0x0000013e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -5154,7 +5154,7 @@ _02171964: ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a30 ; =0x0000013f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, pc} @@ -5167,7 +5167,7 @@ _02171994: ldr r0, _02171a28 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #2 ldmeqia sp!, {r3, r4, r5, pc} @@ -5175,21 +5175,21 @@ _021719c4: ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a2c ; =0x0000013e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #3 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a30 ; =0x0000013f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #4 ldmneia sp!, {r3, r4, r5, pc} ldr r0, _02171a28 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #5 moveq r0, #6 @@ -5743,14 +5743,14 @@ _02172140: .word data_02050f54 arm_func_start func_ov28_02172144 func_ov28_02172144: ; 0x02172144 ldr r0, _02172158 ; =gAdventureFlags - ldr ip, _0217215c ; =func_ov00_02097760 + ldr ip, _0217215c ; =_ZN14AdventureFlags3GetEj mov r1, #0x31 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov28_02172144 _02172158: .word gAdventureFlags -_0217215c: .word func_ov00_02097760 +_0217215c: .word _ZN14AdventureFlags3GetEj .global func_ov28_02172160 arm_func_start func_ov28_02172160 @@ -6144,14 +6144,14 @@ _02172654: .word data_02050f54 arm_func_start func_ov28_02172658 func_ov28_02172658: ; 0x02172658 ldr r0, _0217266c ; =gAdventureFlags - ldr ip, _02172670 ; =func_ov00_02097760 + ldr ip, _02172670 ; =_ZN14AdventureFlags3GetEj mov r1, #0x2f ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov28_02172658 _0217266c: .word gAdventureFlags -_02172670: .word func_ov00_02097760 +_02172670: .word _ZN14AdventureFlags3GetEj .global func_ov28_02172674 arm_func_start func_ov28_02172674 @@ -7105,7 +7105,7 @@ func_ov28_02173210: ; 0x02173210 ldr r0, _021732b4 ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02173278 bl func_ov28_02174948 @@ -7278,7 +7278,7 @@ _02173440: beq _021734e0 ldr r0, _02173500 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02173504 ; =data_027e077c ldreq r1, [r0] @@ -7492,7 +7492,7 @@ func_ov28_021736d0: ; 0x021736d0 strleb r0, [r4, #0x26d] ldr r0, _02173740 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02173744 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -7575,13 +7575,13 @@ func_ov28_021737cc: ; 0x021737cc ldr r0, _02173860 ; =gAdventureFlags mov r1, #0xe3 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02173850 ldr r0, _02173860 ; =gAdventureFlags mov r1, #0xe7 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02173850 ldr r0, _02173864 ; =data_ov09_0211f5b4 @@ -7667,7 +7667,7 @@ func_ov28_021738e0: ; 0x021738e0 ldmeqia sp!, {r4, pc} ldr r0, _02173944 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} ldr r0, _02173948 ; =data_027e0fc8 @@ -8450,7 +8450,7 @@ func_ov28_021742b0: ; 0x021742b0 str r3, [sp, #0x28] strb r2, [sp, #0x10] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _02174384 ; =data_027e0e60 str r0, [r4, #0x228] ldr r0, [r1] @@ -8478,13 +8478,13 @@ func_ov28_02174388: ; 0x02174388 mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x228] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x14 ldmeqia sp!, {r3, r4, pc} ldr r0, _021744b0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x19 addls sp, sp, #0x14 ldmlsia sp!, {r3, r4, pc} @@ -8541,7 +8541,7 @@ _02174488: ldr r0, _021744b0 ; =gAdventureFlags ldr r1, [r4, #0x228] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 mov r0, r4 str r1, [r4, #0x228] @@ -8589,7 +8589,7 @@ func_ov28_02174504: ; 0x02174504 ldmleia sp!, {r4, pc} ldr r0, _0217454c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02174550 ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -8636,7 +8636,7 @@ func_ov28_02174554: ; 0x02174554 ldr r2, [r4, #0x50] str r2, [sp, #0x28] strb r3, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x22c] mvn ip, #0 mov r3, #0x1e @@ -8661,7 +8661,7 @@ func_ov28_02174554: ; 0x02174554 strb ip, [sp, #0x16] strb r3, [sp, #0x14] str r2, [sp, #0x94] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x230] mov r0, r4 mov r1, #0 @@ -8689,12 +8689,12 @@ func_ov28_02174670: ; 0x02174670 mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x230] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _021746c8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xa ldmlsia sp!, {r4, pc} mov r0, r4 @@ -8807,7 +8807,7 @@ func_ov28_0217475c: ; 0x0217475c ldr r0, _02174828 ; =gAdventureFlags ldr r1, [r4, #0x230] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x230] rsb r1, r0, #0x400 @@ -9021,7 +9021,7 @@ func_ov28_02174a5c: ; 0x02174a5c ldr r1, _02174b90 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} ldr r0, [r4, #4] @@ -9143,7 +9143,7 @@ func_ov28_02174bd8: ; 0x02174bd8 mov r1, #0x100 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov28_02174bd8 @@ -9374,7 +9374,7 @@ func_ov28_02174ec4: ; 0x02174ec4 ldr r1, _02174f38 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldreq r0, _02174f3c ; =data_027e0c68 ldreqb r0, [r0, #4] @@ -10694,13 +10694,13 @@ func_ov28_02175f48: ; 0x02175f48 ldr r0, _021761ec ; =gAdventureFlags mov r1, #0x124 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021760ac ldr r0, _021761ec ; =gAdventureFlags mov r1, #0xb5 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #1 streqb r0, [r4, #0x7ad] @@ -10735,7 +10735,7 @@ _021760ac: ldr r0, _021761ec ; =gAdventureFlags ldr r1, _021761f0 ; =0x00000123 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r1, #0 beq _0217612c diff --git a/asm/ov29.inc b/asm/ov29.inc index 69781e88..9c7c6214 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -235,7 +235,7 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097738 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev .extern func_ov00_020a5e9c .extern func_ov00_020a61ac .extern func_ov00_020a9588 diff --git a/asm/ov29.s b/asm/ov29.s index 20f8f2ca..70019134 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -630,7 +630,7 @@ func_ov29_0216ddb0: ; 0x0216ddb0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc} ldr r0, _0216dfec ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #4 ldmneia sp!, {r3, r4, r5, r6, r7, r8, pc} @@ -11287,7 +11287,7 @@ func_ov29_02176ea8: ; 0x02176ea8 ldr r1, _02176fac ; =gAdventureFlags mov r4, r0 ldr r0, [r1] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} diff --git a/asm/ov30.inc b/asm/ov30.inc index 53e7640c..b68c0424 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -148,9 +148,9 @@ .extern func_ov00_02087d34 .extern func_ov00_020884b4 .extern func_ov00_02093a1c -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a5e9c diff --git a/asm/ov30.s b/asm/ov30.s index 9b56d1ce..6f9fab8b 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -2424,7 +2424,7 @@ _0217dca8: _0217dccc: ldr r0, _0217df4c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d addne sp, sp, #0xbc ldmneia sp!, {r3, r4, r5, r6, pc} @@ -2499,14 +2499,14 @@ _0217dd8c: ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0217de10 ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0217de10: mov r0, r5 mov r1, #4 @@ -2565,14 +2565,14 @@ _0217de88: ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0217df0c ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0217df0c: mov r0, r5 mov r1, #4 @@ -2766,7 +2766,7 @@ _0217e160: _0217e184: ldr r0, _0217e3c0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d addne sp, sp, #0xcc ldmneia sp!, {r4, r5, r6, r7, pc} @@ -3992,14 +3992,14 @@ _0217f1f8: ldr r0, _0217f544 ; =gAdventureFlags mov r1, #0x158 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0217f23c ldr r0, _0217f544 ; =gAdventureFlags mov r1, #0x158 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r7 mov r1, #0xe mov r2, #0 @@ -5418,7 +5418,7 @@ func_ov30_02180548: ; 0x02180548 ldr r0, _021805a4 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} @@ -5450,7 +5450,7 @@ func_ov30_021805ac: ; 0x021805ac ldr r0, _02180608 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} @@ -8159,7 +8159,7 @@ func_ov30_021823f8: ; 0x021823f8 ble _02182424 ldr r0, _02182450 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -8169,7 +8169,7 @@ _02182424: ble _02182448 ldr r0, _02182450 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -10136,7 +10136,7 @@ _02183df4: ldr r0, _02183e2c ; =gAdventureFlags mov r1, #0x35 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -13099,14 +13099,14 @@ _0218623c: ldr r0, _021863e0 ; =gAdventureFlags mov r1, #0x11c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02186280 ldr r0, _021863e0 ; =gAdventureFlags mov r1, #0x11c ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r6 mov r1, #2 mov r2, #0 diff --git a/asm/ov31.inc b/asm/ov31.inc index 11ace917..e4542e00 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -158,8 +158,8 @@ .extern func_ov00_020875f8 .extern func_ov00_020888e8 .extern func_ov00_0208b180 -.extern func_ov00_02097760 -.extern func_ov00_0209779c +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a9588 .extern func_ov00_020bc500 .extern func_ov00_020bcdec diff --git a/asm/ov31.s b/asm/ov31.s index 2dfc7085..032b861d 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -1343,7 +1343,7 @@ func_ov31_0217ce90: ; 0x0217ce90 ldr r0, _0217cebc ; =gAdventureFlags mov r1, #0x78 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov31_0217ce90 @@ -5307,21 +5307,21 @@ func_ov31_0217fd84: ; 0x0217fd84 mov r1, #0x67 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _0217fdf0 _0217fdc4: ldr r0, _0217fdfc ; =gAdventureFlags mov r1, #0x68 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _0217fdf0 _0217fddc: ldr r0, _0217fdfc ; =gAdventureFlags mov r1, #0x68 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _0217fdf0: mov r0, r4 bl func_ov31_0217fd54 @@ -5356,7 +5356,7 @@ func_ov31_0217fe2c: ; 0x0217fe2c ldr r0, [r1] mov r1, #0x6b mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 bl func_ov31_0217fd54 ldmia sp!, {r4, pc} @@ -5390,7 +5390,7 @@ func_ov31_0217fe84: ; 0x0217fe84 ldr r0, [r1] mov r1, #0x6a mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 bl func_ov31_0217fd54 ldmia sp!, {r4, pc} @@ -5424,7 +5424,7 @@ func_ov31_0217fedc: ; 0x0217fedc ldr r0, [r1] mov r1, #0x6c mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 bl func_ov31_0217fd54 ldmia sp!, {r4, pc} @@ -5500,21 +5500,21 @@ func_ov31_0217ff9c: ; 0x0217ff9c mov r1, #0x69 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _02180008 _0217ffdc: ldr r0, _02180014 ; =gAdventureFlags mov r1, #0x6d ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb b _02180008 _0217fff4: ldr r0, _02180014 ; =gAdventureFlags mov r1, #0x71 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _02180008: mov r0, r4 bl func_ov31_0217fd54 @@ -6426,28 +6426,28 @@ _021808b0: ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x69 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0xc ldmeqia sp!, {r4, pc} ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x6b ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #7 ldmeqia sp!, {r4, pc} ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x6c ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #8 ldmeqia sp!, {r4, pc} ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x67 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #5 ldmeqia sp!, {r4, pc} @@ -6814,7 +6814,7 @@ _02180d0c: ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x6a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #9 moveq r0, #6 @@ -6823,7 +6823,7 @@ _02180d40: ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x68 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #9 moveq r0, #5 @@ -6846,7 +6846,7 @@ _02180d78: ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x6d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0x10 moveq r0, #0xd @@ -6855,7 +6855,7 @@ _02180dac: ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x71 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 movne r0, #0x11 moveq r0, #0xb @@ -7486,7 +7486,7 @@ func_ov31_021814b8: ; 0x021814b8 mov r4, r0 ldr r0, [r1] mov r1, #0x148 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #8 movne r0, #0 diff --git a/asm/ov32.inc b/asm/ov32.inc index 26fc7ee5..e08e94f6 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -204,14 +204,14 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097738 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bac -.extern func_ov00_02097bbc -.extern func_ov00_02098058 -.extern func_ov00_02098074 -.extern func_ov00_0209809c +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib +.extern _ZN14AdventureFlags18func_ov00_0209809cEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov32.s b/asm/ov32.s index 911520dc..bd9de70d 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -6950,12 +6950,12 @@ _0218174c: ldr r0, _02181cdc ; =gAdventureFlags ldr r1, [r4, #0x60] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181cb4 ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d blo _02181cb4 mov r0, r4 @@ -6985,7 +6985,7 @@ _021817cc: ldr r0, _02181cdc ; =gAdventureFlags ldr r1, [r4, #0x60] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 beq _02181cb4 mov r0, r4 @@ -6999,7 +6999,7 @@ _02181800: ldr r0, _02181cdc ; =gAdventureFlags ldr r1, [r4, #0x60] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181cb4 ldrsh r0, [r4, #0x74] @@ -7051,7 +7051,7 @@ _02181848: _021818cc: ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x2d blo _02181cb4 ldr r0, _02181cec ; =data_027e0ffc @@ -7114,7 +7114,7 @@ _021819a0: _021819b4: ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 bne _02181cb4 mov r0, r4 @@ -7216,12 +7216,12 @@ _02181b28: bl func_ov32_021829ec ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 bne _02181cb4 ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bbc + bl _ZN14AdventureFlags18func_ov00_02097bbcEv cmp r0, #0 bne _02181cb4 ldrsh r0, [r4, #0x76] @@ -7412,7 +7412,7 @@ _02181db0: ldr r0, [r0] add r1, sp, #0x124 strb r2, [sp, #0x134] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x60] add r0, sp, #0x124 bl func_ov00_0209a508 @@ -7474,7 +7474,7 @@ _02181ea4: str r2, [sp, #0x94] str r3, [sp, #0x98] str ip, [sp, #0x9c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x60] mov ip, #7 ldr r0, _02182280 ; =data_027e0ffc @@ -7608,7 +7608,7 @@ _02182080: ldr r0, _0218227c ; =gAdventureFlags mov r3, r2 ldr r0, [r0] - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib mvn r0, #0 str r0, [sp] mov r0, #2 @@ -7699,7 +7699,7 @@ _02182214: mov r2, r1 ldr r0, [r0] mov r3, r1 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib b _0218226c _0218223c: ldr r0, _02182294 ; =data_027e077c @@ -8517,13 +8517,13 @@ func_ov32_02182c40: ; 0x02182c40 beq _02182d68 ldr r0, _02182d7c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02182cbc ldr r0, _02182d7c ; =gAdventureFlags ldr r1, [r5, #0xb0] ldr r0, [r0] - bl func_ov00_02097bac + bl _ZN14AdventureFlags18func_ov00_02097bacEv cmp r0, #0 addeq sp, sp, #0x10 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} @@ -8538,7 +8538,7 @@ func_ov32_02182c40: ; 0x02182c40 _02182cbc: ldr r0, _02182d7c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e bne _02182ce4 ldr r0, _02182d80 ; =data_027e0ffc @@ -8549,7 +8549,7 @@ _02182cbc: _02182ce4: ldr r0, _02182d7c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x1e blo _02182d68 add r0, r5, #0x110 @@ -8641,7 +8641,7 @@ func_ov32_02182db4: ; 0x02182db4 str r2, [sp, #0x2c] str r3, [sp, #0x30] str ip, [sp, #0x34] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r6, #0xb0] add r0, sp, #0xc bl func_ov00_0209a508 diff --git a/asm/ov34.inc b/asm/ov34.inc index 073f36af..8235d8ad 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -141,8 +141,8 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097968 -.extern func_ov00_02097c18 +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a6110 diff --git a/asm/ov34.s b/asm/ov34.s index 2958d034..b1076960 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -903,7 +903,7 @@ _0217c950: ldr r0, _0217cde8 ; =gAdventureFlags mov r1, #0xd ldr r0, [r0] - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 beq _0217c998 ldrb r0, [r5, #0x2b] @@ -7547,7 +7547,7 @@ _02182814: ldr r0, _02182afc ; =gAdventureFlags mov r1, #0xd ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei _02182848: add r0, r4, #0xf8 add r0, r0, #0x1c00 diff --git a/asm/ov35.inc b/asm/ov35.inc index c00ab17d..ec194367 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -170,13 +170,13 @@ .extern func_ov00_02089318 .extern func_ov00_0208b158 .extern func_ov00_0208e7a4 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc -.extern func_ov00_02097ff4 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a6110 diff --git a/asm/ov35.s b/asm/ov35.s index 29338c22..2a5de684 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -3429,7 +3429,7 @@ _0217eb50: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb _0217eb94: mov r0, r5 mov r1, r4 @@ -3598,7 +3598,7 @@ _0217edc0: ldr r0, _0217f044 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0217ee08 ldrb r0, [r4, #0x2a] @@ -4108,7 +4108,7 @@ _0217f2f8: strb r5, [sp, #0x4fe] strb r3, [sp, #0x4ff] strb r2, [sp, #0x500] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x544] cmp r0, r1 @@ -4696,7 +4696,7 @@ _0217fd30: strb r5, [sp, #0x3e7] strb r3, [sp, #0x3e8] str r2, [sp, #0x3ec] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x544] cmp r0, r1 @@ -4802,7 +4802,7 @@ _0217fee0: ldr r1, [sp, #0x50] str r1, [sp, #0x268] add r1, sp, #0x240 - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x544] cmp r0, r1 @@ -5019,7 +5019,7 @@ _0218010c: str r2, [r4, #0x514] ldr r0, [r0] add r1, sp, #0x190 - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x544] cmp r0, r1 @@ -5327,7 +5327,7 @@ _021805ac: strb r5, [sp, #0x16f] strb r3, [sp, #0x170] str r2, [sp, #0x174] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r4, #0x544] cmp r0, r1 @@ -5592,7 +5592,7 @@ func_ov35_02180b68: ; 0x02180b68 mov r4, r1 ldr r0, [r2] ldr r1, [r5, #0x544] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02180b98 ldrb r0, [r5, #0x562] @@ -5654,7 +5654,7 @@ func_ov35_02180c18: ; 0x02180c18 mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x544] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -6067,13 +6067,13 @@ _021811b4: ldr r0, _02181268 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021811f0 ldr r0, _02181268 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021811f0: mvn r1, #0 ldr r0, _0218126c ; =data_027e0fc8 @@ -6584,13 +6584,13 @@ func_ov35_0218187c: ; 0x0218187c ldr r0, _02181988 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021818ec ldr r0, _02181988 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021818ec: mvn r0, #0 str r0, [r4, #0x544] @@ -6736,13 +6736,13 @@ _02181ad0: ldr r0, _02181b50 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181b24 ldr r0, _02181b50 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02181b24: mvn r2, #0 mov r0, r4 @@ -7117,13 +7117,13 @@ _02182038: ldr r0, _021820a4 ; =gAdventureFlags ldr r1, [r5, #0x544] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02182078 ldr r0, _021820a4 ; =gAdventureFlags ldr r1, [r5, #0x544] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02182078: mvn r2, #0 mov r0, r5 @@ -7705,7 +7705,7 @@ func_ov35_02182834: ; 0x02182834 mov r4, r0 ldr r0, [r1] mov r1, #0x1f - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r4, pc} @@ -7740,13 +7740,13 @@ func_ov35_02182834: ; 0x02182834 ldr r0, _02182938 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021828f4 ldr r0, _02182938 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _021828f4: mvn r1, #0 ldr r0, _02182938 ; =gAdventureFlags @@ -7754,7 +7754,7 @@ _021828f4: ldr r0, [r0] mov r1, #0x1f mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _02182944 ; =gItemManager mov r1, #0x1d ldr r0, [r0] @@ -7762,7 +7762,7 @@ _021828f4: ldr r0, _02182938 ; =gAdventureFlags mov r1, #8 ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 diff --git a/asm/ov36.inc b/asm/ov36.inc index cf9d8101..49deea16 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -177,14 +177,14 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc -.extern func_ov00_02097c18 -.extern func_ov00_0209809c +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +.extern _ZN14AdventureFlags18func_ov00_0209809cEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov36.s b/asm/ov36.s index 2df1606b..f755355f 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -1613,7 +1613,7 @@ func_ov36_0217d2a0: ; 0x0217d2a0 mov r5, r0 ldr r0, [r1] mov r1, #0x7e - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x70 movne r0, #0 @@ -1621,7 +1621,7 @@ func_ov36_0217d2a0: ; 0x0217d2a0 ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xe ldr r0, [r0] - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 addne sp, sp, #0x70 movne r0, #0 @@ -1705,17 +1705,17 @@ _0217d368: str lr, [sp, #0x38] str ip, [sp, #0x3c] str r3, [sp, #0x40] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xec ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xed ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add r0, r5, #0x158 bl func_ov36_0217c704 ldr r1, _0217d69c ; =func_ov36_0217c24c @@ -1840,17 +1840,17 @@ _0217d56c: mov r1, #0xeb ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0217d680 ; =gAdventureFlags ldr r1, _0217d6b4 ; =0x0000011e ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _0217d680 ; =gAdventureFlags ldr r1, _0217d6b8 ; =0x0000011f ldr r0, [r0] mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r5 mov r1, #0 bl func_ov36_0217d6bc @@ -2123,7 +2123,7 @@ func_ov36_0217da08: ; 0x0217da08 ldr r0, _0217da68 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _0217da58 mov r0, #0x10000 @@ -2704,13 +2704,13 @@ _0217e260: ldr r0, _0217e3d0 ; =gAdventureFlags ldr r1, [r5, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0217e2a4 ldr r0, _0217e3d0 ; =gAdventureFlags ldr r1, [r5, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0217e2a4: mvn r1, #0 ldr r0, _0217e3a4 ; =data_027e0fc8 @@ -5481,7 +5481,7 @@ _02180860: ldr r3, [r4, #0x274] str r3, [sp, #0x4c] strb r2, [sp, #0x3a] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r7, #0x66c] add r0, sp, #0x24 bl func_ov00_0209a508 @@ -5708,13 +5708,13 @@ _02180c58: ldr r0, _02180d18 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02180c80 ldr r0, _02180d18 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02180c80: mvn r0, #0 add sp, sp, #0x3c @@ -6035,13 +6035,13 @@ _021810d0: ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0218110c ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0218110c: mvn r2, #0 mov r0, r4 @@ -6073,13 +6073,13 @@ _0218116c: ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181194 ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02181194: mvn r0, #0 add sp, sp, #0x118 @@ -6249,7 +6249,7 @@ _021811a4: strb r2, [sp, #0xf8] strb fp, [sp, #0x7c] strb sl, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x66c] cmp r0, #0 add r0, sp, #0x68 @@ -6471,7 +6471,7 @@ _0218166c: strb r3, [sp, #0xf7] strb r2, [sp, #0xf8] strb fp, [sp, #0x7c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x66c] add r0, sp, #0x68 bl func_ov00_0209a508 @@ -6499,7 +6499,7 @@ _021817b0: ldr r0, _021818a4 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181848 ldr r0, [r4, #0x168] @@ -6522,13 +6522,13 @@ _021817f4: ldr r0, _021818a4 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02181830 ldr r0, _021818a4 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02181830: mvn r2, #0 add r0, r4, #0x158 @@ -6612,7 +6612,7 @@ _021818fc: ldr r0, _02181b88 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldr r0, _02181b8c ; =data_ov00_020eec68 mov r1, #5 bl func_ov00_020d716c @@ -6718,7 +6718,7 @@ _021818fc: strb r3, [sp, #0xf7] strb r2, [sp, #0xf8] strb fp, [sp, #0x7c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x66c] ldr r1, [r4, #0x168] mov r2, #0 @@ -6780,7 +6780,7 @@ func_ov36_02181ba8: ; 0x02181ba8 bne _02181c58 ldr r0, _02181f08 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_0209809c + bl _ZN14AdventureFlags18func_ov00_0209809cEv cmp r0, #0 addne sp, sp, #0x14 ldmneia sp!, {r3, r4, pc} @@ -6941,7 +6941,7 @@ _02181e34: ldr r0, _02181f08 ; =gAdventureFlags ldr r1, _02181f34 ; =0x0000011e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreq r0, [r4, #0x6c0] cmpeq r0, #0 @@ -6960,11 +6960,11 @@ _02181e34: ldr r1, _02181f34 ; =0x0000011e ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _02181f08 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r4, #0x66c] ldr r0, _02181f34 ; =0x0000011e @@ -7219,7 +7219,7 @@ _02181ffc: ldrb r3, [r4, #0x7b0] strb r3, [sp, #0x208] strb r2, [sp, #0x18c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x66c] add r0, sp, #0x178 bl func_ov00_0209a508 @@ -7227,7 +7227,7 @@ _02182270: ldr r0, _02182948 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x228 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -7341,7 +7341,7 @@ _021823ec: ldr r0, _02182948 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv add r0, sp, #0xc8 bl func_ov00_0209a4f4 mov r1, #2 @@ -7439,7 +7439,7 @@ _0218248c: strb r7, [sp, #0x157] strb r6, [sp, #0x158] strb r5, [sp, #0xdc] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x66c] ldr r0, [r4, #0x878] tst r0, #0x40 @@ -7637,7 +7637,7 @@ _0218287c: ldr r0, _02182948 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 str r1, [r4, #0x66c] ldr r0, _0218294c ; =data_027e0f90 @@ -7760,13 +7760,13 @@ _021829ec: ldr r0, _02182c7c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02182a7c ldr r0, _02182c7c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02182a7c: mvn r1, #0 add r0, sp, #0x74 @@ -7876,7 +7876,7 @@ _02182a7c: strb ip, [sp, #0x103] strb r3, [sp, #0x104] strb r2, [sp, #0x88] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x66c] mov r0, r4 bl _ZN5Actor20KillPickupItemActorsEv @@ -8149,20 +8149,20 @@ func_ov36_02182f88: ; 0x02182f88 ldr r0, _0218306c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02183030 ldr r0, _0218306c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02183030: mvn r1, #0 ldr r0, _0218306c ; =gAdventureFlags str r1, [r4, #0x66c] ldr r0, [r0] mov r1, #0xe - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei ldr r1, [r4, #0x6b8] mov r2, #0 mov r0, r4 @@ -8750,7 +8750,7 @@ _02183614: strb r2, [sp, #0x12c] strb fp, [sp, #0xb0] strb sl, [sp, #0xb2] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x66c] cmp r0, #0 blt _021838ec @@ -10021,13 +10021,13 @@ func_ov36_02184a64: ; 0x02184a64 mov r6, r1 ldr r0, [r2] ldr r1, [r5, #0x66c] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02184a9c ldr r0, _02184dd8 ; =gAdventureFlags ldr r1, [r5, #0x66c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _02184a9c: add r0, sp, #0x68 bl func_ov00_0209a4f4 @@ -10226,7 +10226,7 @@ _02184c94: strb r3, [sp, #0xf8] strb r2, [sp, #0x7c] strb r2, [sp, #0x7e] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei mvn r1, #0 str r0, [r5, #0x66c] cmp r0, r1 diff --git a/asm/ov37.inc b/asm/ov37.inc index 89f9c3ac..76acfdb3 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -155,7 +155,7 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097968 +.extern _ZN14AdventureFlags18func_ov00_02097968Ei .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov37.s b/asm/ov37.s index 95cff6cd..5aaec115 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -3665,7 +3665,7 @@ _0217f0ac: ldr r0, _0217f11c ; =gAdventureFlags mov r1, #0xf ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei mov r0, r4 bl func_ov00_020cc960 mov r0, r4 diff --git a/asm/ov38.inc b/asm/ov38.inc index 6c1bb88c..7b39d8f9 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -164,13 +164,13 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097760 -.extern func_ov00_0209779c -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc -.extern func_ov00_02097c18 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a6110 diff --git a/asm/ov38.s b/asm/ov38.s index 092df813..b98d9311 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -1351,13 +1351,13 @@ func_ov38_0217cf90: ; 0x0217cf90 mov sl, r0 ldr r0, [r1] mov r1, #0xf7 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0217cfdc ldr r0, _0217d508 ; =gAdventureFlags mov r1, #0x11 ldr r0, [r0] - bl func_ov00_02097c18 + bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi cmp r0, #0 beq _0217cff0 _0217cfdc: @@ -8895,7 +8895,7 @@ func_ov38_02183aa4: ; 0x02183aa4 beq _02183ae0 ldr r0, _02183b5c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02183b04 _02183ae0: @@ -8905,7 +8905,7 @@ _02183ae0: beq _02183b48 ldr r0, _02183b5c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02183b48 _02183b04: @@ -11451,7 +11451,7 @@ func_ov38_02185e38: ; 0x02185e38 strb r3, [sp, #9] strb r2, [sp, #0xa] strb r2, [sp, #0xb] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2e8] ldr r1, _02185eb8 ; =data_ov38_02188ca0 add r0, sp, #0 @@ -11627,12 +11627,12 @@ _02185f5c: ldrb r2, [r2, #0x1e4] strb r2, [sp, #0x134] str r3, [sp, #0x138] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2ec] ldr r0, _02186a34 ; =gAdventureFlags ldr r1, [r4, #0x2e8] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 add r0, sp, #0xa4 str r1, [r4, #0x2e8] @@ -12207,7 +12207,7 @@ _021869dc: ldr r0, _02186a34 ; =gAdventureFlags ldr r1, [r4, #0x2ec] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 ldr r0, _02186a60 ; =data_02057200 str r1, [r4, #0x2ec] @@ -12371,7 +12371,7 @@ func_ov38_02186b08: ; 0x02186b08 ldr r0, _02186c80 ; =gAdventureFlags add r1, sp, #0x14 ldr r0, [r0] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2e8] ldr r1, _02186c78 ; =data_ov38_02188ca0 add r0, sp, #0x14 @@ -12925,7 +12925,7 @@ _0218746c: ldr r0, _02187510 ; =gAdventureFlags ldr r1, [r4, #0x2e8] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldr r0, _0218750c ; =data_ov00_020eec68 mov r1, #0xcd mov r2, #0 @@ -12994,7 +12994,7 @@ func_ov38_02187520: ; 0x02187520 strb r3, [sp, #0xa] strb r3, [sp, #0xb] strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x2e8] ldr r0, [r4, #0xff4] bl func_ov29_0216fe04 @@ -13030,7 +13030,7 @@ func_ov38_021875cc: ; 0x021875cc ldr r2, _02187620 ; =gAdventureFlags ldr r1, [r0, #0x2e8] ldr r0, [r2] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldmia sp!, {r3, pc} _021875f4: ldr r0, _02187624 ; =data_ov38_021891e0 @@ -13234,7 +13234,7 @@ func_ov38_0218762c: ; 0x0218762c strb r3, [sp, #0xcb] ldr r3, [sp, #0x38] strb r3, [sp, #0xcc] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r1, _0218795c ; =data_027e0fc8 str r0, [r4, #0x2e8] ldr r0, [r1] @@ -13657,7 +13657,7 @@ _02187f44: ldr r0, _02188094 ; =gAdventureFlags ldr r1, [r5, #0x2e8] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 ldr r0, _02188098 ; =data_02057200 str r1, [r5, #0x2e8] @@ -13669,11 +13669,11 @@ _02187f44: ldr r0, [r0] mov r1, #0xf7 mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _02188094 ; =gAdventureFlags mov r1, #0x11 ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei add sp, sp, #0x154 ldmia sp!, {r4, r5, pc} _02187fac: diff --git a/asm/ov39.inc b/asm/ov39.inc index 8be077bb..01ca05f2 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -154,10 +154,10 @@ .extern func_ov00_02087fe0 .extern func_ov00_02088000 .extern func_ov00_02089318 -.extern func_ov00_02097810 -.extern func_ov00_02097968 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov39.s b/asm/ov39.s index 9d373280..04832154 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -4938,7 +4938,7 @@ _02180004: ldr r3, [r4, #0x274] str r3, [sp, #0xa8] strb r2, [sp, #0x96] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei add r1, r5, #0x3ec str r0, [r5, #0x190] add r0, r1, #0x400 @@ -5885,7 +5885,7 @@ _02180e94: ldr r0, _02180f28 ; =gAdventureFlags ldr r1, [r5, #0x190] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r4, #0 mov r0, r5 mov r1, #8 @@ -7535,7 +7535,7 @@ func_ov39_021824b4: ; 0x021824b4 add r1, sp, #0xc str r3, [sp, #0x34] strb r2, [sp, #0x22] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x190] ldr r1, [r4, #0x158] add r0, sp, #0xc @@ -7618,7 +7618,7 @@ func_ov39_02182674: ; 0x02182674 mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x190] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _021826e4 mov r1, #0 @@ -7633,7 +7633,7 @@ func_ov39_02182674: ; 0x02182674 str r1, [r4, #0x158] ldr r0, [r0] ldr r1, [r4, #0x190] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r1, #0 mov r0, r4 str r1, [r4, #0x190] @@ -8623,7 +8623,7 @@ func_ov39_021833a4: ; 0x021833a4 ldr r0, [r0] add r1, sp, #0 strb r2, [sp, #0x16] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x190] ldr r1, [r4, #0x158] ldr r0, _02183524 ; =data_ov00_020eec68 @@ -8951,7 +8951,7 @@ func_ov39_021838c4: ; 0x021838c4 ldr r0, _02183c20 ; =gAdventureFlags ldr r1, [r4, #0x190] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv add r0, sp, #0x74 bl func_ov00_0209a4f4 mvn r0, #0 @@ -9119,7 +9119,7 @@ func_ov39_021838c4: ; 0x021838c4 str r3, [sp, #0x94] str r5, [sp, #0x98] str r2, [sp, #0x9c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x190] ldr r1, [r4, #0x158] add r0, sp, #0x74 @@ -9233,7 +9233,7 @@ func_ov39_02183ccc: ; 0x02183ccc ldr r0, _02184314 ; =gAdventureFlags ldr r1, [r7, #0x190] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv add r0, sp, #0xac bl func_ov00_0209a4f4 mov r0, #1 @@ -9330,7 +9330,7 @@ func_ov39_02183ccc: ; 0x02183ccc str r3, [sp, #0xcc] str r4, [sp, #0xd0] str r2, [sp, #0xd4] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei add r5, sp, #0x44 str r0, [r7, #0x190] add r6, r7, #0x2b8 @@ -10098,11 +10098,11 @@ _02184a48: ldr r0, _02184ab0 ; =gAdventureFlags ldr r1, [r4, #0x190] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv ldr r0, _02184ab0 ; =gAdventureFlags mov r1, #0x13 ldr r0, [r0] - bl func_ov00_02097968 + bl _ZN14AdventureFlags18func_ov00_02097968Ei add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/ov40.inc b/asm/ov40.inc index da77d775..8bf1d3ad 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -262,16 +262,16 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_0209779c -.extern func_ov00_02097c08 -.extern func_ov00_02097cf8 -.extern func_ov00_02097db4 -.extern func_ov00_02097e6c -.extern func_ov00_02097e7c -.extern func_ov00_02097ea4 -.extern func_ov00_02097fd0 -.extern func_ov00_02097ff4 -.extern func_ov00_02098074 +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags18func_ov00_02097c08Ev +.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei +.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 +.extern _ZN14AdventureFlags18func_ov00_02097e6cEv +.extern _ZN14AdventureFlags18func_ov00_02097e7cEv +.extern _ZN14AdventureFlags18func_ov00_02097ea4Ev +.extern _ZN14AdventureFlags18func_ov00_02097fd0Ev +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb +.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib .extern func_ov00_020985c4 .extern func_ov00_0209ed18 .extern func_ov00_0209ed2c diff --git a/asm/ov40.s b/asm/ov40.s index 4da86ba6..672736cf 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -1134,7 +1134,7 @@ _0217cd00: ldr r0, _0217cd20 ; =gAdventureFlags ldr r1, [r4, #8] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r4, #0xc] bl func_0201e50c ldmia sp!, {r4, pc} @@ -1370,7 +1370,7 @@ _0217d024: ldr r0, _0217d0ac ; =gAdventureFlags ldr r1, [r4, #8] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r4, #0xc] bl func_0201e50c mov r6, r0 @@ -1438,7 +1438,7 @@ _0217d110: ldr r0, _0217d1a4 ; =gAdventureFlags ldr r1, [r5, #8] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r5, #0xc] bl func_0201e50c mov r4, r0 @@ -1511,7 +1511,7 @@ _0217d208: ldr r0, _0217d29c ; =gAdventureFlags ldr r1, [r5, #8] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r5, #0xc] bl func_0201e50c mov r4, r0 @@ -4419,7 +4419,7 @@ _0217f580: ldr r0, [r0] mov r1, r1, lsr #0x10 mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb add sp, sp, #8 ldmia sp!, {r3, pc} _0217f5a4: @@ -4467,7 +4467,7 @@ _0217f600: str r3, [sp, #4] ldr r0, [r0] mov r2, #0x64 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib add sp, sp, #8 ldmia sp!, {r3, pc} _0217f658: @@ -4536,7 +4536,7 @@ _0217f6f0: mov r1, r1, lsr #0x10 mov r2, r2, lsr #0x10 mov r3, r3, lsr #0x10 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib add sp, sp, #8 ldmia sp!, {r3, pc} _0217f75c: @@ -4565,7 +4565,7 @@ _0217f75c: mov r1, r1, lsr #0x10 mov r2, r2, lsr #0x10 mov r3, r3, lsr #0x10 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib add sp, sp, #8 ldmia sp!, {r3, pc} _0217f7cc: @@ -4574,7 +4574,7 @@ _0217f7cc: ldr r0, [r0] mov r3, r1 mov r2, #1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb add sp, sp, #8 ldmia sp!, {r3, pc} _0217f7ec: @@ -4583,7 +4583,7 @@ _0217f7ec: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb add sp, sp, #8 ldmia sp!, {r3, pc} _0217f80c: @@ -4592,7 +4592,7 @@ _0217f80c: ldr r0, [r0] mov r2, r1 mov r3, r1 - bl func_ov00_02097ff4 + bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb add sp, sp, #8 ldmia sp!, {r3, pc} _0217f82c: @@ -8522,7 +8522,7 @@ func_ov40_021827b0: ; 0x021827b0 mov r0, #0 str r0, [r4, #0xc] ldr r0, [r4, #0x10] - bl func_ov00_02097cf8 + bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei ldr r2, _02182814 ; =0x00000187 mov r1, r0 cmp r1, r2 @@ -8530,7 +8530,7 @@ func_ov40_021827b0: ; 0x021827b0 ldr r0, _02182818 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb _021827e8: ldr r0, [r4, #0x10] cmp r0, #0x10 @@ -8710,7 +8710,7 @@ func_ov40_02182980: ; 0x02182980 ldr r0, [r0] ldr r1, [r5, #0x10] add r2, sp, #8 - bl func_ov00_02097db4 + bl _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2 ldr r0, [sp, #0xc] mov r1, #0x10 cmp r0, #0xfb @@ -8725,7 +8725,7 @@ func_ov40_02182980: ; 0x02182980 str r3, [sp, #4] ldr r0, [r0] mov r2, #0x64 - bl func_ov00_02098074 + bl _ZN14AdventureFlags18func_ov00_02098074Eisiib b _02182a50 _02182a3c: ldr r0, _02182a60 ; =data_027e0d38 @@ -9886,7 +9886,7 @@ func_ov40_021837ec: ; 0x021837ec ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x1c] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r5, #0x20] bl func_0201e50c ldr r1, [r6, #0x138] @@ -9943,7 +9943,7 @@ _021838c8: ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x34] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r5, #0x38] bl func_0201e50c ldr r1, [r6, #0x490] @@ -9971,7 +9971,7 @@ _02183934: ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x4c] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r5, #0x50] bl func_0201e50c ldr r1, [r6, #0x490] @@ -9995,7 +9995,7 @@ _02183990: ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] - bl func_ov00_02097fd0 + bl _ZN14AdventureFlags18func_ov00_02097fd0Ev ldr r1, [r5, #0x68] bl func_0201e50c ldr r1, [r6, #0x490] @@ -10533,7 +10533,7 @@ func_ov40_02184058: ; 0x02184058 ldr r1, [r4, #0x88] str r1, [r4, #0x98] ldr r0, [r0] - bl func_ov00_02097c08 + bl _ZN14AdventureFlags18func_ov00_02097c08Ev cmp r0, #1 bgt _021840b8 beq _021840f4 @@ -12525,7 +12525,7 @@ _021858f4: bl func_ov00_02082650 ldr r0, _02185b44 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097c08 + bl _ZN14AdventureFlags18func_ov00_02097c08Ev sub r0, r0, #0x13 cmp r0, #9 addls pc, pc, r0, lsl #2 @@ -12607,7 +12607,7 @@ _02185a18: bl func_ov00_02082650 ldr r0, _02185b44 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097c08 + bl _ZN14AdventureFlags18func_ov00_02097c08Ev sub r0, r0, #0x13 cmp r0, #9 addls pc, pc, r0, lsl #2 @@ -14009,7 +14009,7 @@ func_ov40_02186c44: ; 0x02186c44 bne _02186c7c ldr r0, _02186c84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 beq _02186c7c ldr r0, _02186c88 ; =data_ov00_020eec9c @@ -14017,7 +14017,7 @@ func_ov40_02186c44: ; 0x02186c44 bl func_ov00_020d77e4 ldr r0, _02186c84 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097e7c + bl _ZN14AdventureFlags18func_ov00_02097e7cEv _02186c7c: mov r0, #0 ldmia sp!, {r3, pc} @@ -14312,12 +14312,12 @@ _02187058: _02187068: ldr r0, _021870a0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 beq _02187094 ldr r0, _021870a0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097ea4 + bl _ZN14AdventureFlags18func_ov00_02097ea4Ev mov r0, r4 mov r1, #5 bl func_ov40_02186f94 @@ -14361,12 +14361,12 @@ _021870f8: _02187108: ldr r0, _02187140 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 beq _02187134 ldr r0, _02187140 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097ea4 + bl _ZN14AdventureFlags18func_ov00_02097ea4Ev mov r0, r4 mov r1, #5 bl func_ov40_02186f94 @@ -14658,7 +14658,7 @@ _02187464: streq r0, [sl, #0x804] ldr r0, _02187550 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097c08 + bl _ZN14AdventureFlags18func_ov00_02097c08Ev cmp r0, #0x15 cmpne r0, #0x16 moveq r0, #0 @@ -14909,12 +14909,12 @@ func_ov40_02187788: ; 0x02187788 beq _021877e4 ldr r0, _021877f0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 beq _021877e4 ldr r0, _021877f0 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097ea4 + bl _ZN14AdventureFlags18func_ov00_02097ea4Ev mov r0, r4 mov r1, #6 bl func_ov40_02187a28 @@ -14943,12 +14943,12 @@ func_ov40_021877f4: ; 0x021877f4 beq _02187850 ldr r0, _0218785c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097e6c + bl _ZN14AdventureFlags18func_ov00_02097e6cEv cmp r0, #0 beq _02187850 ldr r0, _0218785c ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097ea4 + bl _ZN14AdventureFlags18func_ov00_02097ea4Ev mov r0, r4 mov r1, #6 bl func_ov40_02187a28 diff --git a/asm/ov41.inc b/asm/ov41.inc index ffcad088..469ba67b 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -140,7 +140,7 @@ .extern func_ov00_0208cd48 .extern func_ov00_02093a5c .extern func_ov00_02094824 -.extern func_ov00_02097760 +.extern _ZN14AdventureFlags3GetEj .extern func_ov00_020a956c .extern func_ov00_020a9588 .extern func_ov00_020a95a4 diff --git a/asm/ov41.s b/asm/ov41.s index 6a875b0e..8f33129e 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -1977,7 +1977,7 @@ func_ov41_0218ae10: ; 0x0218ae10 mov r4, r0 ldr r0, [r1] mov r1, #2 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldrne r0, _0218af18 ; =0x00640005 ldmneia sp!, {r4, pc} @@ -2894,7 +2894,7 @@ _0218b9b4: ldr r0, _0218be10 ; =gAdventureFlags mov r1, #2 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0218ba48 mov r0, r4 @@ -3522,13 +3522,13 @@ func_ov41_0218c204: ; 0x0218c204 ldr r0, _0218c3c8 ; =gAdventureFlags mov r1, #2 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0218c3b0 ldr r0, _0218c3c8 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0218c3b0 ldr r0, _0218c3cc ; =data_027e0fe4 @@ -3755,13 +3755,13 @@ func_ov41_0218c564: ; 0x0218c564 mov r4, r0 ldr r0, [r1] mov r1, #0xfe - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0218c5cc ldr r0, _0218c5dc ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, r4 bne _0218c5c0 @@ -3992,7 +3992,7 @@ func_ov41_0218c834: ; 0x0218c834 ldr r0, _0218cbe0 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 addne sp, sp, #0x18 movne r0, #1 @@ -4025,7 +4025,7 @@ func_ov41_0218c834: ; 0x0218c834 ldr r0, _0218cbe0 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0218cbd0 cmp r4, #0 @@ -4286,13 +4286,13 @@ _0218cc70: ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xfe ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0218ccf0 ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0218ccf0 ldr r0, [r4, #0x428] @@ -4319,13 +4319,13 @@ _0218cd14: ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xfe ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0218ce78 ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _0218ce78 ldr r0, [r4, #0x428] @@ -4364,7 +4364,7 @@ _0218cda4: ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, r4 bne _0218cde8 @@ -4378,13 +4378,13 @@ _0218cdf0: ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xfe ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _0218ce78 ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldreqb r0, [r4, #0x471] cmpeq r0, #0 diff --git a/asm/ov42.inc b/asm/ov42.inc index 6bc1aa00..3a4b256f 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -115,7 +115,7 @@ .extern func_ov00_02083918 .extern func_ov00_0208726c .extern func_ov00_02087400 -.extern func_ov00_02097760 +.extern _ZN14AdventureFlags3GetEj .extern func_ov00_020a61ac .extern func_ov00_020a9588 .extern func_ov00_020a95a4 diff --git a/asm/ov42.s b/asm/ov42.s index 91a89cce..311a9ebe 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -2158,7 +2158,7 @@ _0218b0a4: ldr r0, _0218b0d8 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, #0x65 beq _0218b0cc diff --git a/asm/ov43.inc b/asm/ov43.inc index 92e75cad..cf5bb96d 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -101,9 +101,9 @@ .extern func_ov00_02083770 .extern func_ov00_02087d34 .extern func_ov00_02093a1c -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a9588 diff --git a/asm/ov43.s b/asm/ov43.s index 746c7a03..25c94233 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -3769,13 +3769,13 @@ _0218c870: ldr r0, _0218c9d0 ; =gAdventureFlags ldr r1, [r4, #0x218] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _0218c8b0 ldr r0, _0218c9d0 ; =gAdventureFlags ldr r1, [r4, #0x218] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv _0218c8b0: mvn r0, #0 str r0, [r4, #0x218] @@ -3878,7 +3878,7 @@ func_ov43_0218c9ec: ; 0x0218c9ec mov r4, r1 ldr r0, [r2] ldr r1, [r5, #0x218] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _0218ca28 mov r0, #0x10000 @@ -4068,7 +4068,7 @@ _0218cb34: strb r4, [sp, #0xf7] strb r3, [sp, #0xf8] strb r2, [sp, #0x7c] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x218] add r0, sp, #0x68 bl func_ov00_0209a508 diff --git a/asm/ov45.inc b/asm/ov45.inc index 4b9b256e..b1e99fbf 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -113,7 +113,7 @@ .extern func_ov00_0207c474 .extern func_ov00_0208726c .extern func_ov00_02087338 -.extern func_ov00_02097760 +.extern _ZN14AdventureFlags3GetEj .extern func_ov00_020a9588 .extern func_ov00_020a95a4 .extern func_ov00_020a9aec diff --git a/asm/ov45.s b/asm/ov45.s index 7c07050c..c8a7a2f8 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -216,7 +216,7 @@ func_ov45_02189764: ; 0x02189764 ldr r0, _0218988c ; =gAdventureFlags ldr r1, _02189890 ; =0x0000010a ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 mov r0, r4 beq _02189868 @@ -1717,7 +1717,7 @@ func_ov45_0218aaf8: ; 0x0218aaf8 ldr r0, _0218ab48 ; =gAdventureFlags mov r1, #0x15 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -2249,7 +2249,7 @@ func_ov45_0218b100: ; 0x0218b100 mov r4, r0 ldr r0, [r1] mov r1, #0x15 - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} diff --git a/asm/ov46.inc b/asm/ov46.inc index aeca5e5e..f6d86327 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -127,8 +127,8 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097760 -.extern func_ov00_0209779c +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a5e9c .extern func_ov00_020a9588 .extern func_ov00_020a95a4 diff --git a/asm/ov46.s b/asm/ov46.s index 90459ad0..e7844a64 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -1603,7 +1603,7 @@ _02191454: ldr r0, [r1] ldr r1, _02191580 ; =0x00000125 mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb ldr r0, _02191574 ; =data_ov00_020eec60 bl func_ov00_020d6b48 b _0219155c @@ -2545,7 +2545,7 @@ func_ov46_02192138: ; 0x02192138 ldr r0, _021921b0 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} ldr r1, [r4, #0xb0] @@ -2672,7 +2672,7 @@ _02192310: ldr r0, _02192408 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02192354 ldrh r0, [r4, #0x20] @@ -2707,7 +2707,7 @@ _02192388: ldr r0, _02192408 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021923b8 _021923a0: @@ -2769,7 +2769,7 @@ func_ov46_02192434: ; 0x02192434 ldr r0, _021924f4 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021924d8 ldrh r0, [r4, #0x20] @@ -2835,7 +2835,7 @@ func_ov46_02192500: ; 0x02192500 ldr r0, _0219254c ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldmeqia sp!, {r4, pc} _02192538: diff --git a/asm/ov49.inc b/asm/ov49.inc index 1a9f9871..3f8d442c 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -121,10 +121,10 @@ .extern func_ov00_02083fb0 .extern func_ov00_02088000 .extern func_ov00_02094824 -.extern func_ov00_02097760 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02098058 +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov49.s b/asm/ov49.s index 6fb35e3f..b0b5a182 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -3122,7 +3122,7 @@ _02197ed0: ldr r0, _02197f00 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -3164,12 +3164,12 @@ _02197f54: ldr r0, _02198034 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _02198034 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0xf ldmloia sp!, {r3, r4, r5, pc} mov r0, r4 @@ -3181,12 +3181,12 @@ _02197f94: ldr r0, _02198034 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _02198034 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x3c blo _02197fd4 mov r0, r4 @@ -3203,7 +3203,7 @@ _02197fe4: ldr r0, _02198034 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 bne _02198010 mov r0, r4 @@ -3214,7 +3214,7 @@ _02197fe4: _02198010: ldr r0, _02198034 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02098058 + bl _ZN14AdventureFlags18func_ov00_02098058Ev cmp r0, #0x78 ldmhsia sp!, {r3, r4, r5, pc} ldr r0, _02198038 ; =data_ov00_020eec9c @@ -3257,7 +3257,7 @@ _02198074: strb r3, [sp, #9] strb r2, [sp, #0xa] strb r2, [sp, #0xb] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x158] add r0, sp, #0 bl func_ov00_0209a508 @@ -3337,7 +3337,7 @@ func_ov49_02198184: ; 0x02198184 beq _021981b0 ldr r0, _021981dc ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} diff --git a/asm/ov50.inc b/asm/ov50.inc index 7a4b5226..61ee99de 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -126,9 +126,9 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a95a4 diff --git a/asm/ov50.s b/asm/ov50.s index 10a0202e..912df9a2 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -694,7 +694,7 @@ _02195e54: ldr r0, _021960ac ; =gAdventureFlags ldr r1, [r5, #0x178] ldr r0, [r0] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 beq _02195eb0 ldr r0, [r5, #0x48] @@ -972,7 +972,7 @@ _02196200: str r2, [sp, #0x30] ldr r2, [r5, #0x50] str r2, [sp, #0x34] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r5, #0x178] add r0, sp, #0xc bl func_ov00_0209a508 @@ -1040,7 +1040,7 @@ _021962e4: blt _02196358 ldr r0, _021963ec ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r0, #0 str r0, [r5, #0x178] _02196358: diff --git a/asm/ov52.inc b/asm/ov52.inc index 755846dc..f64f3a75 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -128,10 +128,10 @@ .extern func_ov00_020838e8 .extern func_ov00_02084b38 .extern func_ov00_0208d01c -.extern func_ov00_02097738 -.extern func_ov00_02097750 -.extern func_ov00_02097760 -.extern func_ov00_0209779c +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a9588 .extern func_ov00_020a95a4 .extern func_ov00_020a9acc diff --git a/asm/ov52.s b/asm/ov52.s index 987c00ca..33c0ffe7 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -93,12 +93,12 @@ func_ov52_021955e4: ; 0x021955e4 ldmneia sp!, {r3, pc} ldr r0, _02195640 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _02195640 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097750 + bl _ZN14AdventureFlags18func_ov00_02097750Ev cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _02195644 ; =data_ov52_02197c40 @@ -339,7 +339,7 @@ func_ov52_02195870: ; 0x02195870 mov r1, #0x100 ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, #1 strb r0, [r4, #0x12] ldmia sp!, {r4, pc} @@ -391,7 +391,7 @@ func_ov52_02195908: ; 0x02195908 ldr r0, [r1] mov r1, #0x100 mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r0, r4 bl func_ov52_021958a0 mov r2, #1 @@ -626,7 +626,7 @@ _02195c5c: ldmneia sp!, {r4, pc} ldr r0, _02195d24 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} ldr r0, _02195d20 ; =data_027e0e60 @@ -735,7 +735,7 @@ func_ov52_02195da0: ; 0x02195da0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} ldr r0, _02196108 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 beq _02195dec bl func_ov03_020fb44c @@ -1013,14 +1013,14 @@ func_ov52_02196198: ; 0x02196198 ldr r0, _021963fc ; =gAdventureFlags ldr r1, _02196400 ; =0x0000011d ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _021961e4 ldr r0, _021963fc ; =gAdventureFlags ldr r1, _02196400 ; =0x0000011d ldr r0, [r0] mov r2, #1 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r4, #0x2a b _021963a4 _021961e4: @@ -2020,7 +2020,7 @@ func_ov52_02196ea8: ; 0x02196ea8 ldr r0, [r1] mov r1, #0x9f mov r2, #0 - bl func_ov00_0209779c + bl _ZN14AdventureFlags3SetEjb mov r1, #0x46 mov r2, r1 add r0, r4, #0x1d8 @@ -2066,7 +2066,7 @@ _02196f6c: ldr r0, _0219706c ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 bne _02196fa4 bl func_ov52_02195754 @@ -2372,7 +2372,7 @@ func_ov52_02197330: ; 0x02197330 ldr r0, _021973b0 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021973a0 ldr r0, _021973b4 ; =data_ov09_0211f5b4 @@ -2438,7 +2438,7 @@ func_ov52_021973f8: ; 0x021973f8 ldr r0, _02197490 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02197480 ldr r0, _02197494 ; =data_ov09_0211f5b4 @@ -2504,7 +2504,7 @@ func_ov52_021974e0: ; 0x021974e0 ldr r0, _02197560 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02197550 ldr r0, _02197564 ; =data_ov09_0211f5b4 @@ -2534,7 +2534,7 @@ func_ov52_02197568: ; 0x02197568 ldr r0, _021975b4 ; =gAdventureFlags mov r1, #0x9f ldr r0, [r0] - bl func_ov00_02097760 + bl _ZN14AdventureFlags3GetEj cmp r0, #0 ldrne r0, _021975b8 ; =0x00870006 ldmneia sp!, {r4, pc} diff --git a/asm/ov55.inc b/asm/ov55.inc index 994ff07d..355c21b1 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -39,9 +39,9 @@ .extern func_0204f8d4 .extern func_ov00_02083f44 .extern func_ov00_02087d34 -.extern func_ov00_02097810 -.extern func_ov00_02097b9c -.extern func_ov00_02097bcc +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a9588 diff --git a/asm/ov55.s b/asm/ov55.s index 51f3b14a..12f1ad31 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -691,7 +691,7 @@ _021994d4: strb r3, [sp, #0x11b] strb r2, [sp, #0x11c] str fp, [sp, #0x120] - bl func_ov00_02097810 + bl _ZN14AdventureFlags18func_Ov00_02097810Ei ldr r2, _02199650 ; =data_027e103c str r0, [r4, #0x5c] mov r1, #1 @@ -725,7 +725,7 @@ func_ov55_02199654: ; 0x02199654 mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x5c] - bl func_ov00_02097b9c + bl _ZN14AdventureFlags18func_ov00_02097b9cEv cmp r0, #0 addeq sp, sp, #0x68 ldmeqia sp!, {r4, pc} @@ -760,7 +760,7 @@ _021996d4: ldr r0, _02199794 ; =gAdventureFlags ldr r1, [r4, #0x5c] ldr r0, [r0] - bl func_ov00_02097bcc + bl _ZN14AdventureFlags18func_ov00_02097bccEv mvn r2, #0 mov r0, r4 mov r1, #0 diff --git a/asm/ov57.inc b/asm/ov57.inc index fafde168..e85da828 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -60,7 +60,7 @@ .extern func_ov00_02087f08 .extern func_ov00_0208967c .extern func_ov00_02093a1c -.extern func_ov00_02097738 +.extern _ZN14AdventureFlags18func_ov00_02097738Ev .extern func_ov00_020b1d3c .extern func_ov00_020b41c4 .extern func_ov00_020bba28 diff --git a/asm/ov57.s b/asm/ov57.s index 1aceef73..bead016f 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -1035,7 +1035,7 @@ _02199a44: ldmneia sp!, {r4, r5, pc} ldr r0, _02199ac8 ; =gAdventureFlags ldr r0, [r0] - bl func_ov00_02097738 + bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 addne sp, sp, #0x74 ldmneia sp!, {r4, r5, pc} diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp new file mode 100644 index 00000000..1a26233a --- /dev/null +++ b/include/Save/AdventureFlags.hpp @@ -0,0 +1,101 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Render/FadeControl.hpp" +#include "System/SysNew.hpp" + +typedef u32 AdventureFlag; +enum AdventureFlag_ { + AdventureFlag_COUNT = 391, +}; + +struct FlagsUnk2 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk16 mUnk_10; + /* 12 */ unk8 mUnk_12; + /* 13 */ unk8 mUnk_13; + /* 14 */ unk8 mUnk_14; + /* 15 */ unk8 mUnk_15; + /* 16 */ unk8 mUnk_16; + /* 17 */ unk8 mUnk_17; + /* 18 */ +}; + +struct FlagsUnk { + /* 00 */ FlagsUnk2 mUnk_00; + /* 18 */ FlagsUnk2 mUnk_18; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk32 mUnk_34; + /* 38 */ unk32 mUnk_38; + /* 3c */ unk16 mUnk_3c; + /* 3e */ unk16 mUnk_3e; + /* 40 */ unk16 mUnk_40; + /* 42 */ unk16 mUnk_42; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk8 mUnk_48; + /* 49 */ unk8 mUnk_49; + /* 4a */ unk8 mUnk_4a; + /* 4b */ unk8 mUnk_4b; + /* 4c */ +}; + +class AdventureFlags : public SysObject { + /* 00 */ unk32 mFlags[16]; + /* 40 */ void *mUnk_40; // contains a fade control + /* 44 */ void *mUnk_44; + /* 48 */ + + static bool Exists(); + void CopyTo(unk32 *flags); + void func_ov00_02097674(); + s32 func_ov00_02097684(); + void Load(); + void func_ov00_020976c8(); + void func_ov00_02097700(); + bool func_ov00_02097738(); + unk8 func_ov00_02097750(); + bool Get(AdventureFlag flag); + void Set(AdventureFlag flag, bool value); + void func_Ov00_02097810(s32 param1); + unk32 func_ov00_02097968(unk32 param1); + unk32 func_ov00_02097a44(unk32 param1, s32 param2); + bool func_ov00_02097b9c(); + bool func_ov00_02097bac(); + bool func_ov00_02097bbc(); + bool func_ov00_02097bcc(); + bool func_ov00_02097bcc(s32 param2); + s32 func_ov00_02097c08(); + bool Get_FlagsUnk_30_Flag(int index); + unk8 Get_FlagsUnk_49(int index); + unk8 Get_FlagsUnk_48(int index); + unk8 Get_FlagsUnk_4a(int index); + unk16 Get_FlagsUnk_42(int index); + unk16 Get_FlagsUnk_40(int index); + unk32 Get_FlagsUnk_38(int index); + unk32 Get_FlagsUnk_34(int index); + unk32 Get_FlagsUnk_44(int index); + static unk32 Get_FlagsUnk_30(int index); + static bool Get_FlagsUnk_00(int index, FlagsUnk2 *result); + bool Get_FlagsUnk_18(int index, FlagsUnk2 *result); + FlagsUnk* Get_FlagsUnk(int index); + bool func_ov00_02097e6c(); + bool func_ov00_02097e7c(); + bool func_ov00_02097ea4(); + static unk32 func_ov00_02097ecc(); + void* func_ov00_02097f8c(); + void* func_ov00_02097fac(); + void* func_ov00_02097fd0(); + void func_ov00_02097ff4(bool param1, bool param2); + unk32 func_ov00_02098058(); + bool func_ov00_02098064(unk32 param1); + bool func_ov00_02098074(unk32 param1, unk16 param2, unk32 param3, unk32 param4, bool param5); + bool func_ov00_0209809c(); + bool func_ov00_020980ac(); + void func_ov00_020980bc(s32 param1); + void func_ov00_020980d0(); +}; diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index e69de29b..e666e04a 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -0,0 +1,50 @@ +#include "Save/AdventureFlags.hpp" + +bool AdventureFlags::Exists() {} +void AdventureFlags::CopyTo(unk32 *flags) {} +void AdventureFlags::func_ov00_02097674() {} +s32 AdventureFlags::func_ov00_02097684() {} +void AdventureFlags::Load() {} +void AdventureFlags::func_ov00_020976c8() {} +void AdventureFlags::func_ov00_02097700() {} +bool AdventureFlags::func_ov00_02097738() {} +unk8 AdventureFlags::func_ov00_02097750() {} +bool AdventureFlags::Get(AdventureFlag flag) {} +void AdventureFlags::Set(AdventureFlag flag, bool value) {} +void AdventureFlags::func_Ov00_02097810(s32 param1) {} +unk32 AdventureFlags::func_ov00_02097968(unk32 param1) {} +unk32 AdventureFlags::func_ov00_02097a44(unk32 param1, s32 param2) {} +bool AdventureFlags::func_ov00_02097b9c() {} +bool AdventureFlags::func_ov00_02097bac() {} +bool AdventureFlags::func_ov00_02097bbc() {} +bool AdventureFlags::func_ov00_02097bcc() {} +bool AdventureFlags::func_ov00_02097bcc(s32 param2) {} +s32 AdventureFlags::func_ov00_02097c08() {} +bool AdventureFlags::Get_FlagsUnk_30_Flag(int index) {} +unk8 AdventureFlags::Get_FlagsUnk_49(int index) {} +unk8 AdventureFlags::Get_FlagsUnk_48(int index) {} +unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {} +unk16 AdventureFlags::Get_FlagsUnk_42(int index) {} +unk16 AdventureFlags::Get_FlagsUnk_40(int index) {} +unk32 AdventureFlags::Get_FlagsUnk_38(int index) {} +unk32 AdventureFlags::Get_FlagsUnk_34(int index) {} +unk32 AdventureFlags::Get_FlagsUnk_44(int index) {} +unk32 AdventureFlags::Get_FlagsUnk_30(int index) {} +bool AdventureFlags::Get_FlagsUnk_00(int index, FlagsUnk2 *result) {} +bool AdventureFlags::Get_FlagsUnk_18(int index, FlagsUnk2 *result) {} +FlagsUnk* AdventureFlags::Get_FlagsUnk(int index) {} +bool AdventureFlags::func_ov00_02097e6c() {} +bool AdventureFlags::func_ov00_02097e7c() {} +bool AdventureFlags::func_ov00_02097ea4() {} +unk32 AdventureFlags::func_ov00_02097ecc() {} +void*AdventureFlags:: func_ov00_02097f8c() {} +void*AdventureFlags:: func_ov00_02097fac() {} +void*AdventureFlags:: func_ov00_02097fd0() {} +void AdventureFlags::func_ov00_02097ff4(bool param1, bool param2) {} +unk32 AdventureFlags::func_ov00_02098058() {} +bool AdventureFlags::func_ov00_02098064(unk32 param1) {} +bool AdventureFlags::func_ov00_02098074(unk32 param1, unk16 param2, unk32 param3, unk32 param4, bool param5) {} +bool AdventureFlags::func_ov00_0209809c() {} +bool AdventureFlags::func_ov00_020980ac() {} +void AdventureFlags::func_ov00_020980bc(s32 param1) {} +void AdventureFlags::func_ov00_020980d0() {}