diff options
| author | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-21 12:42:54 +0200 |
|---|---|---|
| committer | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-21 12:42:54 +0200 |
| commit | e4dacd4f00c8ba6572a8ff47601863bd1d5b0c50 (patch) | |
| tree | 13ae4ef455caaac3329178638e8eacbe10edc2be | |
| parent | 0c078bdc603bd8ac91c17d33dbc7bed6ae43fcec (diff) | |
sub_80EE8F4
| -rw-r--r-- | asm/pokenav.s | 64 | ||||
| -rw-r--r-- | src/pokenav_before.c | 21 |
2 files changed, 21 insertions, 64 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index ccd00414c..37f3130e4 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6,70 +6,6 @@ .text - thumb_func_start sub_80EE8F4 -sub_80EE8F4: @ 80EE8F4 - push {r4,lr} - sub sp, 0x4 - ldr r0, _080EE910 @ =0x02000000 - movs r1, 0xC1 - lsls r1, 2 - adds r4, r0, r1 - ldrh r2, [r4] - cmp r2, 0x1 - beq _080EE932 - cmp r2, 0x1 - bgt _080EE914 - cmp r2, 0 - beq _080EE91A - b _080EE95E - .align 2, 0 -_080EE910: .4byte 0x02000000 -_080EE914: - cmp r2, 0x2 - beq _080EE958 - b _080EE95E -_080EE91A: - movs r1, 0xC2 - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - negs r1, r1 - str r2, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _080EE94C -_080EE932: - ldr r0, _080EE954 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080EE95E - bl sub_80F3130 - movs r0, 0x2 - bl sub_80F2D6C - bl sub_80F6FFC -_080EE94C: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080EE95E - .align 2, 0 -_080EE954: .4byte gPaletteFade -_080EE958: - ldr r0, _080EE968 @ =sub_80EC00C - bl sub_80EBDBC -_080EE95E: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080EE968: .4byte sub_80EC00C - thumb_func_end sub_80EE8F4 - thumb_func_start sub_80EE96C sub_80EE96C: @ 80EE96C push {r4,r5,lr} diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 73567fc33..ceb7a1e98 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -2392,3 +2392,24 @@ label2: break; } } + +void sub_80F6FFC(); + +void sub_80EE8F4() { + switch (ewram0.var304) { + case 0: + BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); + ewram0.var304++; + break; + case 1: + if (gPaletteFade.active) return; + sub_80F3130(); + sub_80F2D6C(0x2); + sub_80F6FFC(); + ewram0.var304++; + break; + case 2: + sub_80EBDBC(&sub_80EC00C); + break; + } +} |