diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 1ea30c3d4..ce829aed1 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -12064,7 +12064,7 @@ glabel var7f1b1e8c /* f0ecdb8: 00000000 */ sll $zero,$zero,0x0 /* f0ecdbc: 10000015 */ beqz $zero,.L0f0ece14 /* f0ecdc0: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ecdc4: 0fc689a7 */ jal func0f1a269c +/* f0ecdc4: 0fc689a7 */ jal htGetTip1 /* f0ecdc8: 00000000 */ sll $zero,$zero,0x0 /* f0ecdcc: 10000011 */ beqz $zero,.L0f0ece14 /* f0ecdd0: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index c90f5599c..69bc1d0d3 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -6268,47 +6268,20 @@ char *htGetDescription(void) return langGet(texts[func0f1a24dc(var80088bb4)]); } -u32 var80088c20 = 0x00005957; -u32 var80088c24 = 0x00005958; -u32 var80088c28 = 0x00005959; -u32 var80088c2c = 0x0000595a; -u32 var80088c30 = 0x0000595b; -u32 var80088c34 = 0x0000595c; -u32 var80088c38 = 0x0000595d; +char *htGetTip1(void) +{ + u32 texts[] = { + L_MISC(343), // "For greater precision..." + L_MISC(344), // "Think about where you want to go..." + L_MISC(345), // "Ducking enables you to..." + L_MISC(346), // "Attacking opponents from behind..." + L_MISC(347), // "Only stay close long enough..." + L_MISC(348), // "Don't hang around and wait..." + L_MISC(349), // "Go for the armed opponents..." + }; -GLOBAL_ASM( -glabel func0f1a269c -/* f1a269c: 27bdffc8 */ addiu $sp,$sp,-56 -/* f1a26a0: 3c0f8009 */ lui $t7,%hi(var80088c20) -/* f1a26a4: afbf0014 */ sw $ra,0x14($sp) -/* f1a26a8: 25ef8c20 */ addiu $t7,$t7,%lo(var80088c20) -/* f1a26ac: 8de10000 */ lw $at,0x0($t7) -/* f1a26b0: 27ae001c */ addiu $t6,$sp,0x1c -/* f1a26b4: 8de80004 */ lw $t0,0x4($t7) -/* f1a26b8: adc10000 */ sw $at,0x0($t6) -/* f1a26bc: 8de10008 */ lw $at,0x8($t7) -/* f1a26c0: adc80004 */ sw $t0,0x4($t6) -/* f1a26c4: 8de8000c */ lw $t0,0xc($t7) -/* f1a26c8: adc10008 */ sw $at,0x8($t6) -/* f1a26cc: 8de10010 */ lw $at,0x10($t7) -/* f1a26d0: adc8000c */ sw $t0,0xc($t6) -/* f1a26d4: 8de80014 */ lw $t0,0x14($t7) -/* f1a26d8: adc10010 */ sw $at,0x10($t6) -/* f1a26dc: 8de10018 */ lw $at,0x18($t7) -/* f1a26e0: 3c048009 */ lui $a0,%hi(var80088bb4) -/* f1a26e4: adc80014 */ sw $t0,0x14($t6) -/* f1a26e8: adc10018 */ sw $at,0x18($t6) -/* f1a26ec: 0fc68937 */ jal func0f1a24dc -/* f1a26f0: 90848bb4 */ lbu $a0,%lo(var80088bb4)($a0) -/* f1a26f4: 00024880 */ sll $t1,$v0,0x2 -/* f1a26f8: 03a92021 */ addu $a0,$sp,$t1 -/* f1a26fc: 0fc5b9f1 */ jal langGet -/* f1a2700: 8c84001c */ lw $a0,0x1c($a0) -/* f1a2704: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a2708: 27bd0038 */ addiu $sp,$sp,0x38 -/* f1a270c: 03e00008 */ jr $ra -/* f1a2710: 00000000 */ sll $zero,$zero,0x0 -); + return langGet(texts[func0f1a24dc(var80088bb4)]); +} u32 var80088c3c = 0x0000595e; u32 var80088c40 = 0x0000595f; diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index 9604a481a..b59eb1a7a 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -104,7 +104,7 @@ u32 func0f1a24dc(u32 arg0); char *htGetName(s32 index); u32 func0f1a25c0(s32 index); char *htGetDescription(void); -u32 func0f1a269c(void); +char *htGetTip1(void); u32 func0f1a2714(void); u32 func0f1a278c(void); u32 func0f1a27cc(void);