diff options
| -rw-r--r-- | asm/tv.s | 52 | ||||
| -rw-r--r-- | include/asm.inc.h | 2 | ||||
| -rw-r--r-- | src/tv.c | 17 |
3 files changed, 18 insertions, 53 deletions
@@ -3121,58 +3121,6 @@ _080BF4F0: .4byte gSaveBlock1 + 0x2738 .section .text_80BF544 - thumb_func_start sub_80BF74C -sub_80BF74C: @ 80BF74C - push {lr} - adds r2, r0, 0 - movs r1, 0x5 -_080BF752: - lsls r0, r1, 24 - asrs r1, r0, 24 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080BF768 - adds r0, r1, 0 - b _080BF778 -_080BF768: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - asrs r0, 24 - cmp r0, 0x17 - ble _080BF752 - movs r0, 0x1 - negs r0, r0 -_080BF778: - pop {r1} - bx r1 - thumb_func_end sub_80BF74C - - thumb_func_start sub_80BF77C -sub_80BF77C: @ 80BF77C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl Random - lsls r0, 16 - lsrs r0, 16 - cmp r0, r4 - bls _080BF794 - movs r0, 0x1 - b _080BF796 -_080BF794: - movs r0, 0 -_080BF796: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80BF77C - thumb_func_start sub_80BF79C sub_80BF79C: @ 80BF79C push {r4-r6,lr} diff --git a/include/asm.inc.h b/include/asm.inc.h index 0c111a991..e13b4668a 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -292,7 +292,7 @@ u8 sub_80BF0B8(u32); void sub_80BF478(void); u16 sub_80BF674(u16 species); s8 sub_80BF720(TVShow *); -u8 sub_80BF77C(u32); +bool8 sub_80BF77C(u16); void sub_80BFD44(void *, u32, u8); void sub_80C0514(void *, u32, u8); @@ -420,6 +420,23 @@ s8 sub_80BF720(TVShow tvShow[]) return -1; } +s8 sub_80BF74C(TVShow tvShow[]) +{ + s8 idx; + for (idx=5; idx<24; idx++) { + if (tvShow[idx].common.var00 == 0) + return idx; + } + return -1; +} + +bool8 sub_80BF77C(u16 value) +{ + if (Random() <= value) + return FALSE; + return TRUE; +} + asm(".section .text_c"); void DoTVShowPokemonNewsMassOutbreak(void) |