diff --git a/asm/rom_2530C.s b/asm/rom_2530C.s index 56b040b..fd832e6 100644 --- a/asm/rom_2530C.s +++ b/asm/rom_2530C.s @@ -2603,89 +2603,3 @@ _08026816: bx r0 .align 2, 0 _0802681C: .4byte 0x0000072A - - thumb_func_start sub_26820 -sub_26820: @ 0x08026820 - push {r4, lr} - lsls r0, r0, #0x10 - asrs r1, r0, #0x10 - cmp r1, #0 - beq _08026878 - ldr r2, _0802686C @ =gCurrentPinballGame - ldr r0, [r2] - ldr r1, _08026870 @ =0x0000072A - adds r0, r0, r1 - movs r3, #1 - strb r3, [r0] - ldr r0, [r2] - movs r4, #0xe5 - lsls r4, r4, #3 - adds r0, r0, r4 - strb r3, [r0] - ldr r0, [r2] - adds r1, #7 - adds r0, r0, r1 - strb r3, [r0] - ldr r0, [r2] - adds r4, #6 - adds r0, r0, r4 - movs r1, #3 - strb r1, [r0] - ldr r0, [r2] - subs r4, #3 - adds r0, r0, r4 - strb r1, [r0] - ldr r0, [r2] - adds r4, #4 - adds r0, r0, r4 - strb r1, [r0] - ldr r0, [r2] - ldr r1, _08026874 @ =0x00000729 - adds r0, r0, r1 - strb r3, [r0] - b _080268AC - .align 2, 0 -_0802686C: .4byte gCurrentPinballGame -_08026870: .4byte 0x0000072A -_08026874: .4byte 0x00000729 -_08026878: - ldr r2, _080268BC @ =gCurrentPinballGame - ldr r0, [r2] - ldr r3, _080268C0 @ =0x00000729 - adds r0, r0, r3 - strb r1, [r0] - ldr r0, [r2] - ldr r4, _080268C4 @ =0x0000072A - adds r0, r0, r4 - strb r1, [r0] - ldr r0, [r2] - subs r3, #1 - adds r0, r0, r3 - strb r1, [r0] - ldr r0, [r2] - adds r4, #4 - adds r0, r0, r4 - strb r1, [r0] - ldr r0, [r2] - adds r3, #3 - adds r0, r0, r3 - strb r1, [r0] - ldr r0, [r2] - adds r4, #1 - adds r0, r0, r4 - movs r1, #2 - strb r1, [r0] -_080268AC: - ldr r0, [r2] - ldr r1, _080268C8 @ =0x0000070E - adds r0, r0, r1 - movs r1, #1 - strb r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080268BC: .4byte gCurrentPinballGame -_080268C0: .4byte 0x00000729 -_080268C4: .4byte 0x0000072A -_080268C8: .4byte 0x0000070E diff --git a/expected_objs/sub_26820.o b/expected_objs/sub_26820.o deleted file mode 100644 index 7e97eb4..0000000 Binary files a/expected_objs/sub_26820.o and /dev/null differ diff --git a/src/rom_27E08.c b/src/rom_27E08.c index 3b0b263..e962be6 100644 --- a/src/rom_27E08.c +++ b/src/rom_27E08.c @@ -17,6 +17,31 @@ extern struct SongHeader gUnknown_0869F58C; extern struct SongHeader gUnknown_0869F5C8; extern struct SongHeader gUnknown_0869F618; +void sub_26820(s16 arg0) +{ + if (arg0) + { + gCurrentPinballGame->unk72A = 1; + gCurrentPinballGame->unk728 = 1; + gCurrentPinballGame->unk731 = 1; + gCurrentPinballGame->unk72E = 3; + gCurrentPinballGame->unk72B = 3; + gCurrentPinballGame->unk72F = 3; + gCurrentPinballGame->unk729 = 1; + } + else + { + gCurrentPinballGame->unk729 = 0; + gCurrentPinballGame->unk72A = 0; + gCurrentPinballGame->unk728 = 0; + gCurrentPinballGame->unk72E = 0; + gCurrentPinballGame->unk72B = 0; + gCurrentPinballGame->unk72F = 2; + } + + gCurrentPinballGame->unk70E = 1; +} + void sub_268CC(void) { gCurrentPinballGame->unk6BC = 0;