diff --git a/include/common.h b/include/common.h index 0acdabc..976a71e 100644 --- a/include/common.h +++ b/include/common.h @@ -300,7 +300,7 @@ extern void func_8017223C(s32); extern void func_80172368(); extern void func_80172394(); extern void __resets_menu_timer(void); -extern u16 D_800C4C26; +extern u16 __maybeBlockingRetraceFunc; extern u16 D_8018F1A2; extern s32 D_8018FB34; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 5f15678..d11d689 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -3,6 +3,7 @@ __SOME_PERSPECITVE_MATRIX_NORM_SCALE = 0x800aee70; // size:2 __SOME_LOOK_AT_MATRIX = 0x800aee30; // size:64 _some_camera_setup = 0x800733F8; retraceFunc = 0x80072398; +__maybeBlockingRetraceFunc = 0x800c4c26; // size:2 _main_stop_all_audio = 0x800EA714; diff --git a/src/4D5C0.c b/src/4D5C0.c index 0d90512..70ebfeb 100644 --- a/src/4D5C0.c +++ b/src/4D5C0.c @@ -8,7 +8,7 @@ OverlaySomething* func_801776C0(void) { /* 4D5CC 801776CC */ void func_801776CC(void) { func_80198080(-1); - D_800C4C26 = 0x800E; + __maybeBlockingRetraceFunc = 0x800E; } /* 4D5F4 801776F4 */ @@ -19,7 +19,7 @@ OverlaySomething* func_801776F4(void) { /* 4D600 80177700 */ void func_80177700(void) { func_80198080(0x29); - D_800C4C26 = 0x8014; + __maybeBlockingRetraceFunc = 0x8014; } /* 4D628 80177728 */ @@ -66,22 +66,22 @@ void __calls_inc_menu_timer(void) { func_80172394(); func_8017223C(1); func_801707F4(); - D_800C4C26 = D_8018F1A2; + __maybeBlockingRetraceFunc = D_8018F1A2; break; case 2: - D_800C4C26 = 0x8012; + __maybeBlockingRetraceFunc = 0x8012; break; case 3: - D_800C4C26 = 0x17; + __maybeBlockingRetraceFunc = 0x17; break; case 4: switch(D_8018FB34) { case 0: - D_800C4C26 = 0xB; + __maybeBlockingRetraceFunc = 0xB; break; case 1: - D_800C4C26 = 0xC; + __maybeBlockingRetraceFunc = 0xC; break; } diff --git a/src/_ob_rabid_jar.c b/src/_ob_rabid_jar.c index ca1df75..0d52c29 100644 --- a/src/_ob_rabid_jar.c +++ b/src/_ob_rabid_jar.c @@ -92,7 +92,7 @@ OverlaySomething* func_80076188(void) { /* 6594 80076194 */ void func_80076194(void) { - D_800C4C26 = 0xFFFE; + __maybeBlockingRetraceFunc = 0xFFFE; } /* 65A4 800761A4 */