diff options
| -rw-r--r-- | asm/pokenav.s | 44 | ||||
| -rw-r--r-- | src/pokenav_before.c | 14 |
2 files changed, 14 insertions, 44 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index 37f3130e4..ebc317bc7 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6,50 +6,6 @@ .text - thumb_func_start sub_80EE96C -sub_80EE96C: @ 80EE96C - push {r4,r5,lr} - sub sp, 0x4 - ldr r0, _080EE99C @ =0x02000000 - movs r1, 0xC1 - lsls r1, 2 - adds r5, r0, r1 - ldrh r4, [r5] - cmp r4, 0 - bne _080EE9A0 - movs r0, 0x6F - bl PlaySE - movs r0, 0x1 - negs r0, r0 - str r4, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - b _080EE9B4 - .align 2, 0 -_080EE99C: .4byte 0x02000000 -_080EE9A0: - ldr r0, _080EE9BC @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080EE9B4 - bl sub_80F5BDC - bl sub_805469C -_080EE9B4: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080EE9BC: .4byte gPaletteFade - thumb_func_end sub_80EE96C - thumb_func_start sub_80EE9C0 sub_80EE9C0: @ 80EE9C0 push {r4-r6,lr} diff --git a/src/pokenav_before.c b/src/pokenav_before.c index ceb7a1e98..1d5015940 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -2413,3 +2413,17 @@ void sub_80EE8F4() { break; } } + +void sub_80EE96C() { + u16 var1 = ewram0.var304; + if (!var1) { + PlaySE(0x6F); + BeginNormalPaletteFade(-1, 0, 0, 0x10, var1); + ewram0.var304++; + } + else { + if (gPaletteFade.active) return; + sub_80F5BDC(); + sub_805469C(); + } +} |