summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/tv.s18
-rw-r--r--src/tv.c7
2 files changed, 7 insertions, 18 deletions
diff --git a/asm/tv.s b/asm/tv.s
index 93c90ff92..42c0121c9 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -2720,24 +2720,6 @@ _080C07C0: .4byte 0x00002abd
.section .dotvshow
- thumb_func_start TVShowConvertInternationalString
-TVShowConvertInternationalString: @ 80C08FC
- push {r4,r5,lr}
- adds r5, r0, 0
- lsls r4, r2, 24
- lsrs r4, 24
- bl StringCopy
- cmp r4, 0x1
- bhi _080C0914
- adds r0, r5, 0
- movs r1, 0x1
- bl ConvertInternationalString
-_080C0914:
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end TVShowConvertInternationalString
-
thumb_func_start DoTVShowBravoTrainerPokemonProfile
DoTVShowBravoTrainerPokemonProfile: @ 80C091C
push {r4,r5,lr}
diff --git a/src/tv.c b/src/tv.c
index 71e13e9ce..56ba9ed2e 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1683,6 +1683,13 @@ void DoTVShow(void) {
}
}
+void TVShowConvertInternationalString(u8 *dest, u8 *src, u8 language) {
+ StringCopy(dest, src);
+ if (language < LANGUAGE_ENGLISH) {
+ ConvertInternationalString(dest, LANGUAGE_JAPANESE);
+ }
+}
+
asm(".section .text_c");
void TVShowConvertInternationalString(u8 *, u8 *, u8);