diff options
| -rwxr-xr-x | asm/pokeblock.s | 26 | ||||
| -rwxr-xr-x | src/pokeblock.c | 21 |
2 files changed, 17 insertions, 30 deletions
diff --git a/asm/pokeblock.s b/asm/pokeblock.s index 0ea1e6e58..eb173c3ba 100755 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -6,32 +6,6 @@ .text - thumb_func_start sub_810B96C -sub_810B96C: @ 810B96C - push {lr} -_0810B96E: - bl sub_810B6C0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0810B988 - ldr r0, _0810B984 @ =sub_810BF7C - movs r1, 0 - bl CreateTask - b _0810B994 - .align 2, 0 -_0810B984: .4byte sub_810BF7C -_0810B988: - bl sub_80F9344 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0810B96E -_0810B994: - pop {r0} - bx r0 - thumb_func_end sub_810B96C - thumb_func_start sub_810B998 sub_810B998: @ 810B998 push {lr} diff --git a/src/pokeblock.c b/src/pokeblock.c index 9f921e357..76a06c5ea 100755 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -14,7 +14,7 @@ #include "menu_helpers.h" #include "pokeblock.h" -void sub_810B674(void) +static void sub_810B674(void) { AnimateSprites(); BuildOamBuffer(); @@ -22,7 +22,7 @@ void sub_810B674(void) UpdatePaletteFade(); } -void sub_810B68C(void) +static void sub_810B68C(void) { u16 *src; vu16 *dest; @@ -42,7 +42,7 @@ void sub_810BB0C(void); void sub_810BB30(void); void sub_810BC84(u8); -bool32 sub_810B6C0(void) +static bool8 sub_810B6C0(void) { u16 ime; switch (gMain.state) @@ -134,7 +134,7 @@ bool32 sub_810B6C0(void) case 16: ime = REG_IME; REG_IME = 0; - REG_IE |= 1; + REG_IE |= INTR_FLAG_VBLANK; REG_IME = ime; REG_DISPSTAT |= DISPSTAT_VBLANK_INTR; SetVBlankCallback(sub_810B68C); @@ -155,3 +155,16 @@ bool32 sub_810B6C0(void) } return FALSE; } + +void sub_810BF7C(u8); + +void sub_810B96C(void) +{ + do { + if (sub_810B6C0() == TRUE) + { + CreateTask(sub_810BF7C, 0); + break; + } + } while (sub_80F9344() != TRUE); +} |