From 43a410404962710c0c93af2d12b6e0c7c4e4b331 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 10 Apr 2020 22:14:01 +1000
Subject: [PATCH] Decompile dtGetTip1

---
 src/game/game_0e5ce0.c              |  2 +-
 src/game/game_19c990.c              | 38 +++++------------------------
 src/include/game/data/data_02da90.h |  2 +-
 src/include/game/game_19c990.h      |  2 +-
 4 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c
index 2b7908a6a..16ce6b328 100644
--- a/src/game/game_0e5ce0.c
+++ b/src/game/game_0e5ce0.c
@@ -12072,7 +12072,7 @@ glabel var7f1b1e8c
 /*  f0ecdd8:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0ecddc:	1000000d */ 	beqz	$zero,.L0f0ece14
 /*  f0ecde0:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f0ecde4:	0fc687c0 */ 	jal	func0f1a1f00
+/*  f0ecde4:	0fc687c0 */ 	jal	dtGetTip1
 /*  f0ecde8:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0ecdec:	10000009 */ 	beqz	$zero,.L0f0ece14
 /*  f0ecdf0:	8fbf0014 */ 	lw	$ra,0x14($sp)
diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index 762de1dc8..17bbe84b1 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -6099,38 +6099,12 @@ glabel func0f1a1e90
 /*  f1a1efc:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f1a1f00
-/*  f1a1f00:	27bdffb8 */ 	addiu	$sp,$sp,-72
-/*  f1a1f04:	3c0f8009 */ 	lui	$t7,%hi(device_tips1)
-/*  f1a1f08:	25ef8b64 */ 	addiu	$t7,$t7,%lo(device_tips1)
-/*  f1a1f0c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f1a1f10:	25e80024 */ 	addiu	$t0,$t7,0x24
-/*  f1a1f14:	27ae0020 */ 	addiu	$t6,$sp,0x20
-.L0f1a1f18:
-/*  f1a1f18:	8de10000 */ 	lw	$at,0x0($t7)
-/*  f1a1f1c:	25ef000c */ 	addiu	$t7,$t7,0xc
-/*  f1a1f20:	25ce000c */ 	addiu	$t6,$t6,0xc
-/*  f1a1f24:	adc1fff4 */ 	sw	$at,-0xc($t6)
-/*  f1a1f28:	8de1fff8 */ 	lw	$at,-0x8($t7)
-/*  f1a1f2c:	adc1fff8 */ 	sw	$at,-0x8($t6)
-/*  f1a1f30:	8de1fffc */ 	lw	$at,-0x4($t7)
-/*  f1a1f34:	15e8fff8 */ 	bne	$t7,$t0,.L0f1a1f18
-/*  f1a1f38:	adc1fffc */ 	sw	$at,-0x4($t6)
-/*  f1a1f3c:	8de10000 */ 	lw	$at,0x0($t7)
-/*  f1a1f40:	3c048009 */ 	lui	$a0,%hi(var80088ad8)
-/*  f1a1f44:	adc10000 */ 	sw	$at,0x0($t6)
-/*  f1a1f48:	0fc6875a */ 	jal	func0f1a1d68
-/*  f1a1f4c:	90848ad8 */ 	lbu	$a0,%lo(var80088ad8)($a0)
-/*  f1a1f50:	00024880 */ 	sll	$t1,$v0,0x2
-/*  f1a1f54:	03a92021 */ 	addu	$a0,$sp,$t1
-/*  f1a1f58:	0fc5b9f1 */ 	jal	langGet
-/*  f1a1f5c:	8c840020 */ 	lw	$a0,0x20($a0)
-/*  f1a1f60:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f1a1f64:	27bd0048 */ 	addiu	$sp,$sp,0x48
-/*  f1a1f68:	03e00008 */ 	jr	$ra
-/*  f1a1f6c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+char *dtGetTip1(void)
+{
+	u32 texts[10] = device_tips1;
+
+	return langGet(texts[func0f1a1d68(var80088ad8)]);
+}
 
 GLOBAL_ASM(
 glabel func0f1a1f70
diff --git a/src/include/game/data/data_02da90.h b/src/include/game/data/data_02da90.h
index f996a3e32..e9a77dd75 100644
--- a/src/include/game/data/data_02da90.h
+++ b/src/include/game/data/data_02da90.h
@@ -37,7 +37,7 @@ extern u32 var80088ae0;
 extern u32 var80088aec;
 extern u32 g_CiDeviceStageFlags[10];
 extern u32 device_descriptions[];
-extern u32 device_tips1[];
+extern u32 device_tips1[10];
 extern u32 device_tips2[];
 extern u8 var80088bb4;
 extern u8 var80088bb8;
diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h
index ed44e11cf..2ba0ebb9a 100644
--- a/src/include/game/game_19c990.h
+++ b/src/include/game/game_19c990.h
@@ -87,7 +87,7 @@ u32 func0f1a1d68(u32 arg0);
 u32 func0f1a1de0(u32 arg0);
 u32 ciGetStageFlagByDeviceIndex(u32 deviceindex);
 u32 func0f1a1e90(void);
-u32 func0f1a1f00(void);
+char *dtGetTip1(void);
 u32 func0f1a1f70(void);
 struct trainingdata *getHoloTrainingData(void);
 void htPushEndscreen(void);