summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-05-20 15:39:03 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-05-20 15:39:03 -0400
commita1c286afde26bf80aba0705ec1ca8841c2c6e2e5 (patch)
tree4a3a2ef38e82d9f45265e9d0fd4b9e79e9ad5651
parent116007e1ff5a1016fa1a598bb97d0b3d48a10fe5 (diff)
sub_80C045C
-rw-r--r--asm/tv.s37
-rw-r--r--src/tv.c9
2 files changed, 9 insertions, 37 deletions
diff --git a/asm/tv.s b/asm/tv.s
index 974abdcee..c2aa9de49 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -1612,43 +1612,6 @@ _080BE474: .4byte gSaveBlock2
.section .text_80BE8EC
- thumb_func_start sub_80C045C
-sub_80C045C: @ 80C045C
- push {r4-r6,lr}
- movs r5, 0
- ldr r6, _080C0494 @ =gSaveBlock1
-_080C0462:
- lsls r0, r5, 3
- adds r0, r5
- lsls r0, 2
- adds r4, r0, r6
- ldr r1, _080C0498 @ =0x00002738
- adds r0, r4, r1
- ldrb r0, [r0]
- bl sub_80BFB54
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x2
- bne _080C0484
- ldr r0, _080C049C @ =0x00002739
- adds r1, r4, r0
- movs r0, 0
- strb r0, [r1]
-_080C0484:
- adds r0, r5, 0x1
- lsls r0, 24
- lsrs r5, r0, 24
- cmp r5, 0x4
- bls _080C0462
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080C0494: .4byte gSaveBlock1
-_080C0498: .4byte 0x00002738
-_080C049C: .4byte 0x00002739
- thumb_func_end sub_80C045C
-
thumb_func_start sub_80C04A0
sub_80C04A0: @ 80C04A0
push {r4,r5,lr}
diff --git a/src/tv.c b/src/tv.c
index f7cc4b4c3..6a1ba2d77 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2002,6 +2002,15 @@ _080C0458: .4byte 0x00002738\n\
}
#endif
+void sub_80C045C(void) {
+ u8 i;
+ for (i=0; i<5; i++) {
+ if (sub_80BFB54(gSaveBlock1.tvShows.shows[i].common.var00) == 2) {
+ gSaveBlock1.tvShows.shows[i].common.var01 = 0;
+ }
+ }
+}
+
asm(".section .dotvshow\n");
void DoTVShowPokemonFanClubLetter(void);