diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s deleted file mode 100644 index e21891a187..0000000000 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel func_8014A52C -/* 0E0C2C 8014A52C 24020008 */ addiu $v0, $zero, 8 -/* 0E0C30 8014A530 3C018016 */ lui $at, 0x8016 -/* 0E0C34 8014A534 A4229AE2 */ sh $v0, -0x651e($at) -/* 0E0C38 8014A538 3C018016 */ lui $at, 0x8016 -/* 0E0C3C 8014A53C A4229AE4 */ sh $v0, -0x651c($at) -/* 0E0C40 8014A540 03E00008 */ jr $ra -/* 0E0C44 8014A544 00000000 */ nop - diff --git a/include/variables.h b/include/variables.h index 30795203f2..64ddc2c6cb 100644 --- a/include/variables.h +++ b/include/variables.h @@ -54,6 +54,8 @@ extern s16* D_80151328; extern s16 D_8010CD10; extern s16 D_8010CD12; extern s32 D_801595A0; +extern s16 D_80159AE2; +extern s16 D_80159AE4; extern BackgroundHeader gBackgroundImage; extern s8 D_8014F12F; diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index 74cc183fb6..0ff9038724 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -4,7 +4,10 @@ INCLUDE_ASM("code_e0b30_len_b80", get_default_variation_for_song); INCLUDE_ASM("code_e0b30_len_b80", func_8014A498); -INCLUDE_ASM("code_e0b30_len_b80", func_8014A52C); +void func_8014A52C(void) { + D_80159AE2 = 0x08; + D_80159AE4 = 0x08; +} INCLUDE_ASM("code_e0b30_len_b80", func_8014A548); diff --git a/undefined_syms.txt b/undefined_syms.txt index ce3f8036ee..40e82dfde6 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -75,6 +75,8 @@ gTriggerList2 = 0x80159290; gCurrentTriggerListPtr = 0x80159390; D_801595A0 = 0x801595A0; +D_80159AE2 = 0x80159AE2; +D_80159AE4 = 0x80159AE4; D_8015C7C0 = 0x8015C7C0; gWorldModelList = 0x80151770;