From 5377a94c7ed77d58d395902e6be9595fece8f6d5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 4 Feb 2020 19:30:44 +1000 Subject: [PATCH] Split game_16cfa0.c into lang.c and rename text symbols to lang --- ld/stage1.ld | 3 + src/game/cheats.c | 40 ++-- src/game/chr/chraicommands.c | 18 +- src/game/data/data_020df0.c | 2 +- src/game/game_00b200.c | 22 +- src/game/game_00c490.c | 8 +- src/game/game_015470.c | 8 +- src/game/game_066310.c | 65 ++--- src/game/game_097a50.c | 10 +- src/game/game_0b0420.c | 14 +- src/game/game_0cf150.c | 2 +- src/game/game_0d4690.c | 4 +- src/game/game_0dcdb0.c | 54 ++--- src/game/game_0f09f0.c | 54 ++--- src/game/game_102240.c | 96 ++++---- src/game/game_107fb0.c | 76 +++--- src/game/game_10ccd0.c | 58 ++--- src/game/game_111600.c | 10 +- src/game/game_129900.c | 40 ++-- src/game/game_1668e0.c | 6 +- src/game/game_16cfa0.c | 343 -------------------------- src/game/game_176d70.c | 150 ++++++------ src/game/game_187770.c | 46 ++-- src/game/game_1999b0.c | 6 +- src/game/game_19c990.c | 110 ++++----- src/game/game_1a3340.c | 78 +++--- src/game/lang.c | 357 ++++++++++++++++++++++++++++ src/gvars/gvars.c | 2 +- src/include/game/data/data_020df0.h | 2 +- src/include/game/game_16cfa0.h | 8 - src/include/game/lang.h | 15 ++ src/include/gvars/gvars.h | 2 +- 32 files changed, 867 insertions(+), 842 deletions(-) create mode 100644 src/game/lang.c create mode 100644 src/include/game/lang.h diff --git a/ld/stage1.ld b/ld/stage1.ld index 7dc2fd9d2..63fdade09 100644 --- a/ld/stage1.ld +++ b/ld/stage1.ld @@ -405,6 +405,7 @@ SECTIONS src/game/game_165670.o (.data); src/game/game_1668e0.o (.data); src/game/game_16cfa0.o (.data); + src/game/lang.o (.data); src/game/game_16e810.o (.data); src/game/game_175f50.o (.data); src/game/game_175f90.o (.data); @@ -502,6 +503,7 @@ SECTIONS src/game/game_165670.o (.text); src/game/game_1668e0.o (.text); src/game/game_16cfa0.o (.text); + src/game/lang.o (.text); src/game/game_16e810.o (.text); src/game/game_175f50.o (.text); src/game/game_175f90.o (.text); @@ -591,6 +593,7 @@ SECTIONS src/game/game_165670.o (.rodata); src/game/game_1668e0.o (.rodata); src/game/game_16cfa0.o (.rodata); + src/game/lang.o (.rodata); src/game/game_16e810.o (.rodata); src/game/game_175f50.o (.rodata); src/game/game_175f90.o (.rodata); diff --git a/src/game/cheats.c b/src/game/cheats.c index 50e9e72d8..735dc5505 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -405,10 +405,10 @@ s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menu_item *item, s32 arg2 char *cheatGetNameIfUnlocked(struct menu_item *item) { if (cheatIsUnlocked(item->param)) { - return textGet(g_Cheats[item->param].nametextid); + return langGet(g_Cheats[item->param].nametextid); } - return textGet(0x544a); // "----------" + return langGet(0x544a); // "----------" } GLOBAL_ASM( @@ -538,21 +538,21 @@ char *cheatGetMarquee(struct menu_item *arg0) if (g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog && g_MenuStack[g_MpPlayerNum].unk00->item == &g_CheatsBuddiesMenuItems[0]) { // Velvet - sprintf(g_CheatMarqueeString, "%s: %s", textGet(0x548f), textGet(0x5475)); // "Buddy Available", "Velvet Dark" + sprintf(g_CheatMarqueeString, "%s: %s", langGet(0x548f), langGet(0x5475)); // "Buddy Available", "Velvet Dark" return g_CheatMarqueeString; } if (cheatIsUnlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s: %s\n", - g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog ? textGet(0x548f) : textGet(0x5488), // "Buddy Available", "Cheat available" - textGet(g_Cheats[cheat_id].nametextid) + g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog ? langGet(0x548f) : langGet(0x5488), // "Buddy Available", "Cheat available" + langGet(g_Cheats[cheat_id].nametextid) ); return g_CheatMarqueeString; } // Locked - strcpy(&cheatname, textGet(g_Cheats[cheat_id].nametextid)); + strcpy(&cheatname, langGet(g_Cheats[cheat_id].nametextid)); ptr = cheatname; while (*ptr != '\n') { @@ -563,15 +563,15 @@ char *cheatGetMarquee(struct menu_item *arg0) if (g_Cheats[cheat_id].flags & CHEATFLAG_COMPLETION) { sprintf(g_CheatMarqueeString, "%s %s: %s %s %s", - textGet(0x5489), // "Complete" - textGet(g_StageNames[g_Cheats[cheat_id].stage_index].name1), - textGet(g_StageNames[g_Cheats[cheat_id].stage_index].name2), - textGet(0x548a), // "for cheat:" + langGet(0x5489), // "Complete" + langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name1), + langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name2), + langGet(0x548a), // "for cheat:" &cheatname ); } else { // Timed - strcpy(&difficultyname, textGet(0x56fb + g_Cheats[cheat_id].difficulty)); + strcpy(&difficultyname, langGet(0x56fb + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -581,21 +581,21 @@ char *cheatGetMarquee(struct menu_item *arg0) *ptr = '\0'; sprintf(g_CheatMarqueeString, "%s %s: %s %s %s %s %d:%02d %s %s", - textGet(0x5489), // "Complete" - textGet(g_StageNames[g_Cheats[cheat_id].stage_index].name1), - textGet(g_StageNames[g_Cheats[cheat_id].stage_index].name2), - textGet(0x548b), // "on" + langGet(0x5489), // "Complete" + langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name1), + langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name2), + langGet(0x548b), // "on" &difficultyname, - textGet(0x548c), // "in under" + langGet(0x548c), // "in under" g_Cheats[cheat_id].time / 60, g_Cheats[cheat_id].time % 60, - textGet(0x548a), // "for cheat:" + langGet(0x548a), // "for cheat:" &cheatname ); } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - func00013224(&g_CheatMarqueeString, textGet(0x548d)); // " or insert Game Boy ..." + func00013224(&g_CheatMarqueeString, langGet(0x548d)); // " or insert Game Boy ..." } func00013224(&g_CheatMarqueeString, "\n"); @@ -603,7 +603,7 @@ char *cheatGetMarquee(struct menu_item *arg0) } // No cheat selected - return textGet(0x548e); // "Select cheat for information" + return langGet(0x548e); // "Select cheat for information" } bool cheatMenuHandleTurnOffAllCheats(u32 operation, u32 arg1, u32 *arg2) @@ -652,5 +652,5 @@ s32 cheatGetTime(s32 cheat_id) char *cheatGetName(s32 cheat_id) { - return textGet(g_Cheats[cheat_id].nametextid); + return langGet(g_Cheats[cheat_id].nametextid); } diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index b9cf27cce..a35c103cb 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -6115,7 +6115,7 @@ glabel aiDuplicateChr bool aiMessage(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - char *text = textGet(cmd[4] | (cmd[3] << 8)); + char *text = langGet(cmd[4] | (cmd[3] << 8)); struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); u32 prevplayernum = g_Vars.currentplayernum; @@ -6146,11 +6146,11 @@ bool aiShowText(void) if (cmd[2] == 0) { u32 text_id = cmd[5] | (cmd[4] << 8); - char *text = textGet(text_id); + char *text = langGet(text_id); func0f0de034(text, 7, cmd[3]); } else if (cmd[2] == 1) { u32 text_id = cmd[5] | (cmd[4] << 8); - char *text = textGet(text_id); + char *text = langGet(text_id); func0f0de034(text, 8, cmd[3]); } else { func0f0dde60(); @@ -6167,7 +6167,7 @@ bool aiShowText(void) bool aiShowText2(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - char *text = textGet(cmd[4] | (cmd[3] << 8)); + char *text = langGet(cmd[4] | (cmd[3] << 8)); struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); u32 prevplayernum = g_Vars.currentplayernum; @@ -6220,7 +6220,7 @@ glabel aiSpeak /* f0560a8: 05a00008 */ bltz $t5,.L0f0560cc /* f0560ac: 01c03025 */ or $a2,$t6,$zero /* f0560b0: afa20040 */ sw $v0,0x40($sp) -/* f0560b4: 0fc5b9f1 */ jal textGet +/* f0560b4: 0fc5b9f1 */ jal langGet /* f0560b8: afae0034 */ sw $t6,0x34($sp) /* f0560bc: 8fa50040 */ lw $a1,0x40($sp) /* f0560c0: 8fa60034 */ lw $a2,0x34($sp) @@ -6320,7 +6320,7 @@ glabel aiSpeak // s32 prevplayernum = g_Vars.currentplayernum; // s32 playernum = g_Vars.currentplayernum; // u32 audioref; -// char *text = text_id >= 0 ? textGet(text_id) : NULL; +// char *text = text_id >= 0 ? langGet(text_id) : NULL; // // if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { // playernum = propGetPlayerNum(chr->prop); @@ -9828,7 +9828,7 @@ glabel ai0130 /* f05a87c: 00036840 */ sll $t5,$v1,0x1 /* f05a880: 018dc021 */ addu $t8,$t4,$t5 /* f05a884: 00982021 */ addu $a0,$a0,$t8 -/* f05a888: 0fc5b9f1 */ jal textGet +/* f05a888: 0fc5b9f1 */ jal langGet /* f05a88c: 84849682 */ lh $a0,-0x697e($a0) /* f05a890: afa20080 */ sw $v0,0x80($sp) /* f05a894: 0c004103 */ jal audioIsFiltered @@ -9851,7 +9851,7 @@ glabel ai0130 /* f05a8d4: 000a4840 */ sll $t1,$t2,0x1 /* f05a8d8: 01e95821 */ addu $t3,$t7,$t1 /* f05a8dc: 008b2021 */ addu $a0,$a0,$t3 -/* f05a8e0: 0fc5b9f1 */ jal textGet +/* f05a8e0: 0fc5b9f1 */ jal langGet /* f05a8e4: 84849682 */ lh $a0,-0x697e($a0) /* f05a8e8: afa20080 */ sw $v0,0x80($sp) /* f05a8ec: 0c004103 */ jal audioIsFiltered @@ -10019,7 +10019,7 @@ glabel ai0130 /* f05ab48: 000250c0 */ sll $t2,$v0,0x3 /* f05ab4c: 014f4821 */ addu $t1,$t2,$t7 /* f05ab50: 00892021 */ addu $a0,$a0,$t1 -/* f05ab54: 0fc5b9f1 */ jal textGet +/* f05ab54: 0fc5b9f1 */ jal langGet /* f05ab58: 84849680 */ lh $a0,-0x6980($a0) /* f05ab5c: afa20080 */ sw $v0,0x80($sp) /* f05ab60: 0c004103 */ jal audioIsFiltered diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index b61cf8738..acc58f965 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -9652,7 +9652,7 @@ u32 var8008411c = 0x00000000; u32 g_LanguageId = 0; // 2a144 -u16 g_LangBanks[] = { +u16 g_LangFiles[] = { /*0x00*/ 0x0000, /*0x01*/ 0x0570, // 02xx - ame /*0x02*/ 0x0577, // 04xx - arch diff --git a/src/game/game_00b200.c b/src/game/game_00b200.c index a295fd0f4..fc547e8dd 100644 --- a/src/game/game_00b200.c +++ b/src/game/game_00b200.c @@ -99,50 +99,50 @@ glabel func0f00b210 GLOBAL_ASM( glabel func0f00b320 /* f00b320: 27bdffe0 */ addiu $sp,$sp,-32 -/* f00b324: 3c02800b */ lui $v0,%hi(g_TextBanks) +/* f00b324: 3c02800b */ lui $v0,%hi(g_LangBanks) /* f00b328: 3c03800b */ lui $v1,%hi(var800aabb4) /* f00b32c: afbf001c */ sw $ra,0x1c($sp) /* f00b330: afb00018 */ sw $s0,0x18($sp) /* f00b334: afa40020 */ sw $a0,0x20($sp) /* f00b338: 2463abb4 */ addiu $v1,$v1,%lo(var800aabb4) -/* f00b33c: 2442aaa0 */ addiu $v0,$v0,%lo(g_TextBanks) +/* f00b33c: 2442aaa0 */ addiu $v0,$v0,%lo(g_LangBanks) .L0f00b340: /* f00b340: 24420004 */ addiu $v0,$v0,0x4 /* f00b344: 1443fffe */ bne $v0,$v1,.L0f00b340 /* f00b348: ac40fffc */ sw $zero,-0x4($v0) -/* f00b34c: 0fc5b9bd */ jal textGetFileId +/* f00b34c: 0fc5b9bd */ jal langGetFileId /* f00b350: 24040026 */ addiu $a0,$zero,0x26 /* f00b354: 00402025 */ or $a0,$v0,$zero /* f00b358: 0fc59c3f */ jal func0f1670fc /* f00b35c: 24050022 */ addiu $a1,$zero,0x22 -/* f00b360: 3c10800b */ lui $s0,%hi(g_TextBanks) -/* f00b364: 2610aaa0 */ addiu $s0,$s0,%lo(g_TextBanks) +/* f00b360: 3c10800b */ lui $s0,%hi(g_LangBanks) +/* f00b364: 2610aaa0 */ addiu $s0,$s0,%lo(g_LangBanks) /* f00b368: ae020098 */ sw $v0,0x98($s0) -/* f00b36c: 0fc5b9bd */ jal textGetFileId +/* f00b36c: 0fc5b9bd */ jal langGetFileId /* f00b370: 24040028 */ addiu $a0,$zero,0x28 /* f00b374: 00402025 */ or $a0,$v0,$zero /* f00b378: 0fc59c3f */ jal func0f1670fc /* f00b37c: 24050022 */ addiu $a1,$zero,0x22 /* f00b380: ae0200a0 */ sw $v0,0xa0($s0) -/* f00b384: 0fc5b9bd */ jal textGetFileId +/* f00b384: 0fc5b9bd */ jal langGetFileId /* f00b388: 24040029 */ addiu $a0,$zero,0x29 /* f00b38c: 00402025 */ or $a0,$v0,$zero /* f00b390: 0fc59c3f */ jal func0f1670fc /* f00b394: 24050022 */ addiu $a1,$zero,0x22 /* f00b398: ae0200a4 */ sw $v0,0xa4($s0) -/* f00b39c: 0fc5b9bd */ jal textGetFileId +/* f00b39c: 0fc5b9bd */ jal langGetFileId /* f00b3a0: 2404002a */ addiu $a0,$zero,0x2a /* f00b3a4: 00402025 */ or $a0,$v0,$zero /* f00b3a8: 0fc59c3f */ jal func0f1670fc /* f00b3ac: 24050022 */ addiu $a1,$zero,0x22 /* f00b3b0: ae0200a8 */ sw $v0,0xa8($s0) -/* f00b3b4: 0fc5b9bd */ jal textGetFileId +/* f00b3b4: 0fc5b9bd */ jal langGetFileId /* f00b3b8: 2404002b */ addiu $a0,$zero,0x2b /* f00b3bc: 00402025 */ or $a0,$v0,$zero /* f00b3c0: 0fc59c3f */ jal func0f1670fc /* f00b3c4: 24050022 */ addiu $a1,$zero,0x22 /* f00b3c8: ae0200ac */ sw $v0,0xac($s0) -/* f00b3cc: 0fc5b9bd */ jal textGetFileId +/* f00b3cc: 0fc5b9bd */ jal langGetFileId /* f00b3d0: 2404002c */ addiu $a0,$zero,0x2c /* f00b3d4: 00402025 */ or $a0,$v0,$zero /* f00b3d8: 0fc59c3f */ jal func0f1670fc @@ -152,7 +152,7 @@ glabel func0f00b320 /* f00b3e8: ae0200b0 */ sw $v0,0xb0($s0) /* f00b3ec: 55c10008 */ bnel $t6,$at,.L0f00b410 /* f00b3f0: 8fbf001c */ lw $ra,0x1c($sp) -/* f00b3f4: 0fc5b9bd */ jal textGetFileId +/* f00b3f4: 0fc5b9bd */ jal langGetFileId /* f00b3f8: 24040027 */ addiu $a0,$zero,0x27 /* f00b3fc: 00402025 */ or $a0,$v0,$zero /* f00b400: 0fc59c3f */ jal func0f1670fc diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 07612cadb..3bf78a1e6 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -2844,12 +2844,12 @@ glabel func0f00e980 /* f00ea0c: 02002025 */ or $a0,$s0,$zero /* f00ea10: 02428021 */ addu $s0,$s2,$v0 /* f00ea14: 02a2a023 */ subu $s4,$s5,$v0 -/* f00ea18: 0fc5b878 */ jal textGetLangBankIndexFromStagenum +/* f00ea18: 0fc5b878 */ jal langGetLangBankIndexFromStagenum /* f00ea1c: 02602025 */ or $a0,$s3,$zero /* f00ea20: a622001a */ sh $v0,0x1a($s1) /* f00ea24: 3044ffff */ andi $a0,$v0,0xffff /* f00ea28: 02002825 */ or $a1,$s0,$zero -/* f00ea2c: 0fc5b9d9 */ jal textSetBank +/* f00ea2c: 0fc5b9d9 */ jal langSetBank /* f00ea30: 02803025 */ or $a2,$s4,$zero /* f00ea34: 8e580010 */ lw $t8,0x10($s2) /* f00ea38: 02589821 */ addu $s3,$s2,$t8 @@ -3000,9 +3000,9 @@ glabel func0f00eb64 /* f00ec3c: 2463d050 */ addiu $v1,$v1,%lo(g_GeCreditsData) /* f00ec40: ac620000 */ sw $v0,0x0($v1) /* f00ec44: 8fa40060 */ lw $a0,0x60($sp) -/* f00ec48: 0fc5b878 */ jal textGetLangBankIndexFromStagenum +/* f00ec48: 0fc5b878 */ jal langGetLangBankIndexFromStagenum /* f00ec4c: afa20040 */ sw $v0,0x40($sp) -/* f00ec50: 0fc5b9ca */ jal textSetBankSimple +/* f00ec50: 0fc5b9ca */ jal langSetBankSimple /* f00ec54: 00402025 */ or $a0,$v0,$zero /* f00ec58: 8fa90040 */ lw $t1,0x40($sp) /* f00ec5c: 3c07800a */ lui $a3,%hi(g_StageSetup) diff --git a/src/game/game_015470.c b/src/game/game_015470.c index b3a9162ad..343373884 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -1844,7 +1844,7 @@ glabel func0f0166ec /* f016c80: afac00dc */ sw $t4,0xdc($sp) /* f016c84: 860d0002 */ lh $t5,0x2($s0) /* f016c88: afad00d8 */ sw $t5,0xd8($sp) -/* f016c8c: 0fc5b9f1 */ jal textGet +/* f016c8c: 0fc5b9f1 */ jal langGet /* f016c90: 9604000a */ lhu $a0,0xa($s0) /* f016c94: 0c002f02 */ jal func0000bc08 /* f016c98: 00409825 */ or $s3,$v0,$zero @@ -4200,7 +4200,7 @@ glabel func0f018ebc /* f018f00: afa50094 */ sw $a1,0x94($sp) /* f018f04: afa60098 */ sw $a2,0x98($sp) /* f018f08: afa7009c */ sw $a3,0x9c($sp) -/* f018f0c: 0fc5b9f1 */ jal textGet +/* f018f0c: 0fc5b9f1 */ jal langGet /* f018f10: afb0008c */ sw $s0,0x8c($sp) /* f018f14: 3c0f8006 */ lui $t7,0x8006 /* f018f18: 95ef286c */ lhu $t7,0x286c($t7) @@ -5751,7 +5751,7 @@ glabel func0f01a510 /* f01a52c: 0fc54d8a */ jal func0f153628 /* f01a530: 00402025 */ or $a0,$v0,$zero /* f01a534: 00408025 */ or $s0,$v0,$zero -/* f01a538: 0fc5b9f1 */ jal textGet +/* f01a538: 0fc5b9f1 */ jal langGet /* f01a53c: 24045647 */ addiu $a0,$zero,0x5647 /* f01a540: 3c0e8008 */ lui $t6,0x8008 /* f01a544: 8dcefb1c */ lw $t6,-0x4e4($t6) @@ -5836,7 +5836,7 @@ glabel func0f01a510 /* f01a678: afae001c */ sw $t6,0x1c($sp) /* f01a67c: 00408025 */ or $s0,$v0,$zero .L0f01a680: -/* f01a680: 0fc5b9f1 */ jal textGet +/* f01a680: 0fc5b9f1 */ jal langGet /* f01a684: 24045648 */ addiu $a0,$zero,0x5648 /* f01a688: 3c0f8008 */ lui $t7,0x8008 /* f01a68c: 8deffb1c */ lw $t7,-0x4e4($t7) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 311a80175..91a2cc099 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -36,6 +36,7 @@ #include "game/game_165670.h" #include "game/game_1668e0.h" #include "game/game_16cfa0.h" +#include "game/lang.h" #include "game/game_176d70.h" #include "game/game_187770.h" #include "game/game_1999b0.h" @@ -38501,7 +38502,7 @@ glabel func0f087638 /* f087638: 27bdffe8 */ addiu $sp,$sp,-24 /* f08763c: afbf0014 */ sw $ra,0x14($sp) /* f087640: afa40018 */ sw $a0,0x18($sp) -/* f087644: 0fc5b9f1 */ jal textGet +/* f087644: 0fc5b9f1 */ jal langGet /* f087648: 24045200 */ addiu $a0,$zero,0x5200 /* f08764c: 8fa40018 */ lw $a0,0x18($sp) /* f087650: 0c004c89 */ jal func00013224 @@ -38627,7 +38628,7 @@ glabel func0f087668 /* f0877f8: 8fae0028 */ lw $t6,0x28($sp) /* f0877fc: 10c00008 */ beqz $a2,.L0f087820 /* f087800: 00000000 */ sll $zero,$zero,0x0 -/* f087804: 0fc5b9f1 */ jal textGet +/* f087804: 0fc5b9f1 */ jal langGet /* f087808: 24045204 */ addiu $a0,$zero,0x5204 /* f08780c: 8fa40030 */ lw $a0,0x30($sp) /* f087810: 0c004c89 */ jal func00013224 @@ -38635,7 +38636,7 @@ glabel func0f087668 /* f087818: 10000007 */ beqz $zero,.L0f087838 /* f08781c: 8fae0028 */ lw $t6,0x28($sp) .L0f087820: -/* f087820: 0fc5b9f1 */ jal textGet +/* f087820: 0fc5b9f1 */ jal langGet /* f087824: 24045205 */ addiu $a0,$zero,0x5205 /* f087828: 8fa40030 */ lw $a0,0x30($sp) /* f08782c: 0c004c89 */ jal func00013224 @@ -38647,7 +38648,7 @@ glabel func0f087668 /* f087840: 8fb80024 */ lw $t8,0x24($sp) /* f087844: 11e00008 */ beqz $t7,.L0f087868 /* f087848: 00000000 */ sll $zero,$zero,0x0 -/* f08784c: 0fc5b9f1 */ jal textGet +/* f08784c: 0fc5b9f1 */ jal langGet /* f087850: 24045206 */ addiu $a0,$zero,0x5206 /* f087854: 8fa40030 */ lw $a0,0x30($sp) /* f087858: 0c004c89 */ jal func00013224 @@ -38655,7 +38656,7 @@ glabel func0f087668 /* f087860: 10000007 */ beqz $zero,.L0f087880 /* f087864: 8fb80024 */ lw $t8,0x24($sp) .L0f087868: -/* f087868: 0fc5b9f1 */ jal textGet +/* f087868: 0fc5b9f1 */ jal langGet /* f08786c: 24045207 */ addiu $a0,$zero,0x5207 /* f087870: 8fa40030 */ lw $a0,0x30($sp) /* f087874: 0c004c89 */ jal func00013224 @@ -38667,7 +38668,7 @@ glabel func0f087668 /* f087888: 8fa90020 */ lw $t1,0x20($sp) /* f08788c: 13200008 */ beqz $t9,.L0f0878b0 /* f087890: 00000000 */ sll $zero,$zero,0x0 -/* f087894: 0fc5b9f1 */ jal textGet +/* f087894: 0fc5b9f1 */ jal langGet /* f087898: 24045202 */ addiu $a0,$zero,0x5202 /* f08789c: 8fa40030 */ lw $a0,0x30($sp) /* f0878a0: 0c004c89 */ jal func00013224 @@ -38675,7 +38676,7 @@ glabel func0f087668 /* f0878a8: 10000007 */ beqz $zero,.L0f0878c8 /* f0878ac: 8fa90020 */ lw $t1,0x20($sp) .L0f0878b0: -/* f0878b0: 0fc5b9f1 */ jal textGet +/* f0878b0: 0fc5b9f1 */ jal langGet /* f0878b4: 24045203 */ addiu $a0,$zero,0x5203 /* f0878b8: 8fa40030 */ lw $a0,0x30($sp) /* f0878bc: 0c004c89 */ jal func00013224 @@ -38687,7 +38688,7 @@ glabel func0f087668 /* f0878d0: 8fbf0014 */ lw $ra,0x14($sp) /* f0878d4: 11400008 */ beqz $t2,.L0f0878f8 /* f0878d8: 00000000 */ sll $zero,$zero,0x0 -/* f0878dc: 0fc5b9f1 */ jal textGet +/* f0878dc: 0fc5b9f1 */ jal langGet /* f0878e0: 24045208 */ addiu $a0,$zero,0x5208 /* f0878e4: 8fa40030 */ lw $a0,0x30($sp) /* f0878e8: 0c004c89 */ jal func00013224 @@ -38695,7 +38696,7 @@ glabel func0f087668 /* f0878f0: 10000007 */ beqz $zero,.L0f087910 /* f0878f4: 8fbf0014 */ lw $ra,0x14($sp) .L0f0878f8: -/* f0878f8: 0fc5b9f1 */ jal textGet +/* f0878f8: 0fc5b9f1 */ jal langGet /* f0878fc: 24045209 */ addiu $a0,$zero,0x5209 /* f087900: 8fa40030 */ lw $a0,0x30($sp) /* f087904: 0c004c89 */ jal func00013224 @@ -38722,7 +38723,7 @@ glabel func0f08791c /* f087944: 54a10009 */ bnel $a1,$at,.L0f08796c /* f087948: 24010009 */ addiu $at,$zero,0x9 .L0f08794c: -/* f08794c: 0fc5b9f1 */ jal textGet +/* f08794c: 0fc5b9f1 */ jal langGet /* f087950: 2404520a */ addiu $a0,$zero,0x520a /* f087954: 8fa40018 */ lw $a0,0x18($sp) /* f087958: 0c004c89 */ jal func00013224 @@ -38733,7 +38734,7 @@ glabel func0f08791c .L0f08796c: /* f08796c: 14e10018 */ bne $a3,$at,.L0f0879d0 /* f087970: 24effffd */ addiu $t7,$a3,-3 -/* f087974: 0fc5b9f1 */ jal textGet +/* f087974: 0fc5b9f1 */ jal langGet /* f087978: 24045215 */ addiu $a0,$zero,0x5215 /* f08797c: 8fa40018 */ lw $a0,0x18($sp) /* f087980: 0c004c89 */ jal func00013224 @@ -38742,7 +38743,7 @@ glabel func0f08791c /* f08798c: 24010001 */ addiu $at,$zero,0x1 /* f087990: 15c10008 */ bne $t6,$at,.L0f0879b4 /* f087994: 00000000 */ sll $zero,$zero,0x0 -/* f087998: 0fc5b9f1 */ jal textGet +/* f087998: 0fc5b9f1 */ jal langGet /* f08799c: 24045216 */ addiu $a0,$zero,0x5216 /* f0879a0: 8fa40018 */ lw $a0,0x18($sp) /* f0879a4: 0c004c89 */ jal func00013224 @@ -38750,7 +38751,7 @@ glabel func0f08791c /* f0879ac: 10000054 */ beqz $zero,.L0f087b00 /* f0879b0: 8fbf0014 */ lw $ra,0x14($sp) .L0f0879b4: -/* f0879b4: 0fc5b9f1 */ jal textGet +/* f0879b4: 0fc5b9f1 */ jal langGet /* f0879b8: 24045217 */ addiu $a0,$zero,0x5217 /* f0879bc: 8fa40018 */ lw $a0,0x18($sp) /* f0879c0: 0c004c89 */ jal func00013224 @@ -38813,7 +38814,7 @@ glabel func0f08791c .L0f087aa0: /* f087aa0: 04820008 */ bltzl $a0,.L0f087ac4 /* f087aa4: 8fb80020 */ lw $t8,0x20($sp) -/* f087aa8: 0fc5b9f1 */ jal textGet +/* f087aa8: 0fc5b9f1 */ jal langGet /* f087aac: afa7001c */ sw $a3,0x1c($sp) /* f087ab0: 8fa40018 */ lw $a0,0x18($sp) /* f087ab4: 0c004c89 */ jal func00013224 @@ -38830,7 +38831,7 @@ glabel func0f08791c /* f087adc: 24010014 */ addiu $at,$zero,0x14 /* f087ae0: 50e10007 */ beql $a3,$at,.L0f087b00 /* f087ae4: 8fbf0014 */ lw $ra,0x14($sp) -/* f087ae8: 0fc5b9f1 */ jal textGet +/* f087ae8: 0fc5b9f1 */ jal langGet /* f087aec: 24045218 */ addiu $a0,$zero,0x5218 /* f087af0: 8fa40018 */ lw $a0,0x18($sp) /* f087af4: 0c004c89 */ jal func00013224 @@ -39578,7 +39579,7 @@ glabel func0f08841c /* f0884fc: 3c0d8008 */ lui $t5,0x8008 /* f088500: 11800008 */ beqz $t4,.L0f088524 /* f088504: 00000000 */ sll $zero,$zero,0x0 -/* f088508: 0fc5b9f1 */ jal textGet +/* f088508: 0fc5b9f1 */ jal langGet /* f08850c: 24045201 */ addiu $a0,$zero,0x5201 /* f088510: 8fa40020 */ lw $a0,0x20($sp) /* f088514: 0c004c89 */ jal func00013224 @@ -39591,7 +39592,7 @@ glabel func0f08841c /* f08852c: 8fab0018 */ lw $t3,0x18($sp) /* f088530: 1060002b */ beqz $v1,.L0f0885e0 /* f088534: 8fb90024 */ lw $t9,0x24($sp) -/* f088538: 0fc5b9f1 */ jal textGet +/* f088538: 0fc5b9f1 */ jal langGet /* f08853c: 24045200 */ addiu $a0,$zero,0x5200 /* f088540: 8fa40020 */ lw $a0,0x20($sp) /* f088544: 0c004c89 */ jal func00013224 @@ -39631,7 +39632,7 @@ glabel func0f08841c /* f0885bc: 10000001 */ beqz $zero,.L0f0885c4 /* f0885c0: 24045208 */ addiu $a0,$zero,0x5208 .L0f0885c4: -/* f0885c4: 0fc5b9f1 */ jal textGet +/* f0885c4: 0fc5b9f1 */ jal langGet /* f0885c8: 00000000 */ sll $zero,$zero,0x0 /* f0885cc: 8fa40020 */ lw $a0,0x20($sp) /* f0885d0: 0c004c89 */ jal func00013224 @@ -39670,7 +39671,7 @@ glabel func0f08841c /* f088644: 10000001 */ beqz $zero,.L0f08864c /* f088648: 24045209 */ addiu $a0,$zero,0x5209 .L0f08864c: -/* f08864c: 0fc5b9f1 */ jal textGet +/* f08864c: 0fc5b9f1 */ jal langGet /* f088650: 00000000 */ sll $zero,$zero,0x0 /* f088654: 8fa40020 */ lw $a0,0x20($sp) /* f088658: 0c004c89 */ jal func00013224 @@ -39741,7 +39742,7 @@ glabel func0f08841c /* f088748: 01826821 */ addu $t5,$t4,$v0 /* f08874c: a1a0ffff */ sb $zero,-0x1($t5) .L0f088750: -/* f088750: 0fc5b9f1 */ jal textGet +/* f088750: 0fc5b9f1 */ jal langGet /* f088754: 24045200 */ addiu $a0,$zero,0x5200 /* f088758: 8fa40020 */ lw $a0,0x20($sp) /* f08875c: 0c004c89 */ jal func00013224 @@ -39868,7 +39869,7 @@ glabel func0f088840 /* f088908: 8fa4009c */ lw $a0,0x9c($sp) /* f08890c: 14400004 */ bnez $v0,.L0f088920 /* f088910: 00402025 */ or $a0,$v0,$zero -/* f088914: 0fc5b9f1 */ jal textGet +/* f088914: 0fc5b9f1 */ jal langGet /* f088918: 24045228 */ addiu $a0,$zero,0x5228 /* f08891c: 00402025 */ or $a0,$v0,$zero .L0f088920: @@ -40276,12 +40277,12 @@ glabel func0f088840 /* f088ee0: 11810005 */ beq $t4,$at,.L0f088ef8 /* f088ee4: 00000000 */ sll $zero,$zero,0x0 .L0f088ee8: -/* f088ee8: 0fc5b9f1 */ jal textGet +/* f088ee8: 0fc5b9f1 */ jal langGet /* f088eec: 24045229 */ addiu $a0,$zero,0x5229 /* f088ef0: 10000004 */ beqz $zero,.L0f088f04 /* f088ef4: 00402025 */ or $a0,$v0,$zero .L0f088ef8: -/* f088ef8: 0fc5b9f1 */ jal textGet +/* f088ef8: 0fc5b9f1 */ jal langGet /* f088efc: 2404522a */ addiu $a0,$zero,0x522a /* f088f00: 00402025 */ or $a0,$v0,$zero .L0f088f04: @@ -40319,7 +40320,7 @@ glabel func0f088840 /* f088f74: 8fa4009c */ lw $a0,0x9c($sp) /* f088f78: 14400004 */ bnez $v0,.L0f088f8c /* f088f7c: 00402025 */ or $a0,$v0,$zero -/* f088f80: 0fc5b9f1 */ jal textGet +/* f088f80: 0fc5b9f1 */ jal langGet /* f088f84: 2404522b */ addiu $a0,$zero,0x522b /* f088f88: 00402025 */ or $a0,$v0,$zero .L0f088f8c: @@ -48351,11 +48352,11 @@ bool func0f09018c(struct prop *doorprop) } if (override && override->activatetextid) { - func0f0ddfa4(textGet(override->activatetextid), 0, 1); + func0f0ddfa4(langGet(override->activatetextid), 0, 1); } else if (intraining) { - func0f0ddfa4(textGet(0x1c50), 0, 1); // "Cannot exit while training is in progress." + func0f0ddfa4(langGet(0x1c50), 0, 1); // "Cannot exit while training is in progress." } else { - func0f0ddfa4(textGet(0x522c), 0, 1); // "This door is locked." + func0f0ddfa4(langGet(0x522c), 0, 1); // "This door is locked." } } @@ -54298,7 +54299,7 @@ s32 objectiveGetCount(void) char *objectiveGetText(s32 index) { if (index < 10 && g_Objectives[index]) { - return textGet(g_Objectives[index]->text); + return langGet(g_Objectives[index]->text); } return NULL; @@ -54863,7 +54864,7 @@ glabel func0f095d64 /* f095e40: 01b0c024 */ and $t8,$t5,$s0 /* f095e44: 1300002a */ beqz $t8,.L0f095ef0 /* f095e48: 2404582c */ addiu $a0,$zero,0x582c -/* f095e4c: 0fc5b9f1 */ jal textGet +/* f095e4c: 0fc5b9f1 */ jal langGet /* f095e50: 26b00001 */ addiu $s0,$s5,0x1 /* f095e54: 02402025 */ or $a0,$s2,$zero /* f095e58: 02e02825 */ or $a1,$s7,$zero @@ -54872,7 +54873,7 @@ glabel func0f095d64 /* f095e64: 02003825 */ or $a3,$s0,$zero /* f095e68: 163e000b */ bne $s1,$s8,.L0f095e98 /* f095e6c: 00000000 */ sll $zero,$zero,0x0 -/* f095e70: 0fc5b9f1 */ jal textGet +/* f095e70: 0fc5b9f1 */ jal langGet /* f095e74: 2404582d */ addiu $a0,$zero,0x582d /* f095e78: 02402025 */ or $a0,$s2,$zero /* f095e7c: 0c004c89 */ jal func00013224 @@ -54885,7 +54886,7 @@ glabel func0f095d64 .L0f095e98: /* f095e98: 1620000b */ bnez $s1,.L0f095ec8 /* f095e9c: 24010002 */ addiu $at,$zero,0x2 -/* f095ea0: 0fc5b9f1 */ jal textGet +/* f095ea0: 0fc5b9f1 */ jal langGet /* f095ea4: 2404582e */ addiu $a0,$zero,0x582e /* f095ea8: 02402025 */ or $a0,$s2,$zero /* f095eac: 0c004c89 */ jal func00013224 @@ -54898,7 +54899,7 @@ glabel func0f095d64 .L0f095ec8: /* f095ec8: 16210009 */ bne $s1,$at,.L0f095ef0 /* f095ecc: 00000000 */ sll $zero,$zero,0x0 -/* f095ed0: 0fc5b9f1 */ jal textGet +/* f095ed0: 0fc5b9f1 */ jal langGet /* f095ed4: 2404582f */ addiu $a0,$zero,0x582f /* f095ed8: 02402025 */ or $a0,$s2,$zero /* f095edc: 0c004c89 */ jal func00013224 diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index dee88ccb7..8a7602958 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -12692,7 +12692,7 @@ glabel func0f0a215c /* f0a2170: afbf0014 */ sw $ra,0x14($sp) /* f0a2174: 10400005 */ beqz $v0,.L0f0a218c /* f0a2178: 00000000 */ sll $zero,$zero,0x0 -/* f0a217c: 0fc5b9f1 */ jal textGet +/* f0a217c: 0fc5b9f1 */ jal langGet /* f0a2180: 94440046 */ lhu $a0,0x46($v0) /* f0a2184: 10000004 */ beqz $zero,.L0f0a2198 /* f0a2188: 8fbf0014 */ lw $ra,0x14($sp) @@ -12732,7 +12732,7 @@ glabel func0f0a21d0 /* f0a21e4: afbf0014 */ sw $ra,0x14($sp) /* f0a21e8: 10400005 */ beqz $v0,.L0f0a2200 /* f0a21ec: 00000000 */ sll $zero,$zero,0x0 -/* f0a21f0: 0fc5b9f1 */ jal textGet +/* f0a21f0: 0fc5b9f1 */ jal langGet /* f0a21f4: 94440044 */ lhu $a0,0x44($v0) /* f0a21f8: 10000004 */ beqz $zero,.L0f0a220c /* f0a21fc: 8fbf0014 */ lw $ra,0x14($sp) @@ -22512,7 +22512,7 @@ glabel func0f0aa86c /* f0aad44: 0fc44b3e */ jal func0f112cf8 /* f0aad48: 00402025 */ or $a0,$v0,$zero /* f0aad4c: 00402025 */ or $a0,$v0,$zero -/* f0aad50: 0fc5b9f1 */ jal textGet +/* f0aad50: 0fc5b9f1 */ jal langGet /* f0aad54: a7a200ba */ sh $v0,0xba($sp) /* f0aad58: 8faa0058 */ lw $t2,0x58($sp) /* f0aad5c: 97a300ba */ lhu $v1,0xba($sp) @@ -22678,7 +22678,7 @@ glabel func0f0aa86c /* f0aafbc: 504000bd */ beqzl $v0,.L0f0ab2b4 /* f0aafc0: 8fa500fc */ lw $a1,0xfc($sp) /* f0aafc4: 94440004 */ lhu $a0,0x4($v0) -/* f0aafc8: 0fc5b9f1 */ jal textGet +/* f0aafc8: 0fc5b9f1 */ jal langGet /* f0aafcc: afaa0058 */ sw $t2,0x58($sp) /* f0aafd0: 3c18ff55 */ lui $t8,0xff55 /* f0aafd4: 8fa300bc */ lw $v1,0xbc($sp) @@ -22702,7 +22702,7 @@ glabel func0f0aa86c /* f0ab014: a54f006c */ sh $t7,0x6c($t2) /* f0ab018: 31e4ffff */ andi $a0,$t7,0xffff .L0f0ab01c: -/* f0ab01c: 0fc5b9f1 */ jal textGet +/* f0ab01c: 0fc5b9f1 */ jal langGet /* f0ab020: afaa0058 */ sw $t2,0x58($sp) /* f0ab024: 8faa0058 */ lw $t2,0x58($sp) /* f0ab028: 00403025 */ or $a2,$v0,$zero diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index 2d35cf7ac..d6865d782 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -234,7 +234,7 @@ glabel func0f0b05a4 /* f0b05e0: 0fc3089f */ jal func0f0c227c /* f0b05e4: 00000000 */ sll $zero,$zero,0x0 /* f0b05e8: afa2002c */ sw $v0,0x2c($sp) -/* f0b05ec: 0fc5b9f1 */ jal textGet +/* f0b05ec: 0fc5b9f1 */ jal langGet /* f0b05f0: 24044c01 */ addiu $a0,$zero,0x4c01 /* f0b05f4: 3c08800a */ lui $t0,%hi(g_Vars) /* f0b05f8: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -357,7 +357,7 @@ glabel func0f0b0764 /* f0b0798: 8f281940 */ lw $t0,0x1940($t9) /* f0b079c: 15010008 */ bne $t0,$at,.L0f0b07c0 /* f0b07a0: 00000000 */ sll $zero,$zero,0x0 -/* f0b07a4: 0fc5b9f1 */ jal textGet +/* f0b07a4: 0fc5b9f1 */ jal langGet /* f0b07a8: 24044c02 */ addiu $a0,$zero,0x4c02 /* f0b07ac: 27a40030 */ addiu $a0,$sp,0x30 /* f0b07b0: 0c004dad */ jal sprintf @@ -365,10 +365,10 @@ glabel func0f0b0764 /* f0b07b8: 10000011 */ beqz $zero,.L0f0b0800 /* f0b07bc: 27a40030 */ addiu $a0,$sp,0x30 .L0f0b07c0: -/* f0b07c0: 0fc5b9f1 */ jal textGet +/* f0b07c0: 0fc5b9f1 */ jal langGet /* f0b07c4: 24044c03 */ addiu $a0,$zero,0x4c03 /* f0b07c8: afa20028 */ sw $v0,0x28($sp) -/* f0b07cc: 0fc5b9f1 */ jal textGet +/* f0b07cc: 0fc5b9f1 */ jal langGet /* f0b07d0: 24044c04 */ addiu $a0,$zero,0x4c04 /* f0b07d4: 3c03800a */ lui $v1,%hi(g_Vars) /* f0b07d8: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) @@ -429,7 +429,7 @@ glabel func0f0b0818 /* f0b0898: 016c4021 */ addu $t0,$t3,$t4 .L0f0b089c: /* f0b089c: afa30030 */ sw $v1,0x30($sp) -/* f0b08a0: 0fc5b9f1 */ jal textGet +/* f0b08a0: 0fc5b9f1 */ jal langGet /* f0b08a4: afa8002c */ sw $t0,0x2c($sp) /* f0b08a8: 8fa30030 */ lw $v1,0x30($sp) /* f0b08ac: 8fa8002c */ lw $t0,0x2c($sp) @@ -726,7 +726,7 @@ glabel func0f0b09f4 /* f0b0cc4: 00000000 */ sll $zero,$zero,0x0 /* f0b0cc8: 05200010 */ bltz $t1,.L0f0b0d0c /* f0b0ccc: 00000000 */ sll $zero,$zero,0x0 -/* f0b0cd0: 0fc5b9f1 */ jal textGet +/* f0b0cd0: 0fc5b9f1 */ jal langGet /* f0b0cd4: 240458b7 */ addiu $a0,$zero,0x58b7 /* f0b0cd8: 8faa0150 */ lw $t2,0x150($sp) /* f0b0cdc: 3c07800b */ lui $a3,0x800b @@ -809,7 +809,7 @@ glabel func0f0b09f4 /* f0b0de8: 00000000 */ sll $zero,$zero,0x0 /* f0b0dec: 05800010 */ bltz $t4,.L0f0b0e30 /* f0b0df0: 00000000 */ sll $zero,$zero,0x0 -/* f0b0df4: 0fc5b9f1 */ jal textGet +/* f0b0df4: 0fc5b9f1 */ jal langGet /* f0b0df8: 240458b8 */ addiu $a0,$zero,0x58b8 /* f0b0dfc: 8fb80154 */ lw $t8,0x154($sp) /* f0b0e00: 3c07800b */ lui $a3,0x800b diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index 98ce81511..baaad0530 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -1598,7 +1598,7 @@ glabel func0f0d0310 /* f0d07b0: 8f290480 */ lw $t1,0x480($t9) /* f0d07b4: 0fc1905e */ jal func0f064178 /* f0d07b8: 8d240000 */ lw $a0,0x0($t1) -/* f0d07bc: 0fc5b9f1 */ jal textGet +/* f0d07bc: 0fc5b9f1 */ jal langGet /* f0d07c0: 240458da */ addiu $a0,$zero,0x58da /* f0d07c4: afa20060 */ sw $v0,0x60($sp) /* f0d07c8: 0fc28857 */ jal func0f0a215c diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index b6d6ce8c6..7b9e54e0d 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -4104,7 +4104,7 @@ glabel func0f0d78f4 /* f0d7ec8: 1000001d */ beqz $zero,.L0f0d7f40 /* f0d7ecc: afa20098 */ sw $v0,0x98($sp) .L0f0d7ed0: -/* f0d7ed0: 0fc5b9f1 */ jal textGet +/* f0d7ed0: 0fc5b9f1 */ jal langGet /* f0d7ed4: 00000000 */ sll $zero,$zero,0x0 /* f0d7ed8: 0c002f02 */ jal func0000bc08 /* f0d7edc: afa20048 */ sw $v0,0x48($sp) @@ -5373,7 +5373,7 @@ glabel func0f0d8f78 /* f0d91b8: 1160001f */ beqz $t3,.L0f0d9238 /* f0d91bc: ac220f98 */ sw $v0,0xf98($at) /* f0d91c0: 240459b7 */ addiu $a0,$zero,0x59b7 -/* f0d91c4: 0fc5b9f1 */ jal textGet +/* f0d91c4: 0fc5b9f1 */ jal langGet /* f0d91c8: afa30090 */ sw $v1,0x90($sp) /* f0d91cc: 0c002f02 */ jal func0000bc08 /* f0d91d0: 00409025 */ or $s2,$v0,$zero diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 3bf0091be..f40231911 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -15784,7 +15784,7 @@ glabel func0f0e6328 /* f0e74fc: 00017043 */ sra $t6,$at,0x1 .L0f0e7500: /* f0e7500: 01ee5021 */ addu $t2,$t7,$t6 -/* f0e7504: 0fc5b9f1 */ jal textGet +/* f0e7504: 0fc5b9f1 */ jal langGet /* f0e7508: afaa012c */ sw $t2,0x12c($sp) /* f0e750c: 0c002f06 */ jal func0000bc18 /* f0e7510: 00409825 */ or $s3,$v0,$zero @@ -17492,7 +17492,7 @@ glabel func0f0e85ac .L0f0e8d70: /* f0e8d70: 27ac00a8 */ addiu $t4,$sp,0xa8 /* f0e8d74: 016c8821 */ addu $s1,$t3,$t4 -/* f0e8d78: 0fc5b9f1 */ jal textGet +/* f0e8d78: 0fc5b9f1 */ jal langGet /* f0e8d7c: 96240000 */ lhu $a0,0x0($s1) /* f0e8d80: 3c0f8008 */ lui $t7,0x8008 /* f0e8d84: 8deffb04 */ lw $t7,-0x4fc($t7) @@ -17572,7 +17572,7 @@ glabel func0f0e85ac /* f0e8e9c: 0fc54f8e */ jal func0f153e38 /* f0e8ea0: 8c84229c */ lw $a0,0x229c($a0) .L0f0e8ea4: -/* f0e8ea4: 0fc5b9f1 */ jal textGet +/* f0e8ea4: 0fc5b9f1 */ jal langGet /* f0e8ea8: 96240000 */ lhu $a0,0x0($s1) /* f0e8eac: 3c0e8008 */ lui $t6,0x8008 /* f0e8eb0: 3c198008 */ lui $t9,0x8008 @@ -18309,7 +18309,7 @@ glabel func0f0e98ac /* f0e98f4: 3c04800a */ lui $a0,0x800a /* f0e98f8: 000fc040 */ sll $t8,$t7,0x1 /* f0e98fc: 00982021 */ addu $a0,$a0,$t8 -/* f0e9900: 0fc5b9f1 */ jal textGet +/* f0e9900: 0fc5b9f1 */ jal langGet /* f0e9904: 9484dfca */ lhu $a0,-0x2036($a0) /* f0e9908: 87b90146 */ lh $t9,0x146($sp) /* f0e990c: 8fa30134 */ lw $v1,0x134($sp) @@ -18497,7 +18497,7 @@ glabel func0f0e98ac /* f0e9bd0: 10000015 */ beqz $zero,.L0f0e9c28 /* f0e9bd4: 00000000 */ sll $zero,$zero,0x0 .L0f0e9bd8: -/* f0e9bd8: 0fc5b9f1 */ jal textGet +/* f0e9bd8: 0fc5b9f1 */ jal langGet /* f0e9bdc: 24045601 */ addiu $a0,$zero,0x5601 /* f0e9be0: 3c0fffff */ lui $t7,0xffff /* f0e9be4: 35ef00ff */ ori $t7,$t7,0xff @@ -18505,7 +18505,7 @@ glabel func0f0e98ac /* f0e9bec: 1000000e */ beqz $zero,.L0f0e9c28 /* f0e9bf0: afaf00c8 */ sw $t7,0xc8($sp) .L0f0e9bf4: -/* f0e9bf4: 0fc5b9f1 */ jal textGet +/* f0e9bf4: 0fc5b9f1 */ jal langGet /* f0e9bf8: 24045600 */ addiu $a0,$zero,0x5600 /* f0e9bfc: 3c1800ff */ lui $t8,0xff /* f0e9c00: 371800ff */ ori $t8,$t8,0xff @@ -18513,7 +18513,7 @@ glabel func0f0e98ac /* f0e9c08: 10000007 */ beqz $zero,.L0f0e9c28 /* f0e9c0c: afb800c8 */ sw $t8,0xc8($sp) .L0f0e9c10: -/* f0e9c10: 0fc5b9f1 */ jal textGet +/* f0e9c10: 0fc5b9f1 */ jal langGet /* f0e9c14: 24045602 */ addiu $a0,$zero,0x5602 /* f0e9c18: 3c19ff40 */ lui $t9,0xff40 /* f0e9c1c: 373940ff */ ori $t9,$t9,0x40ff @@ -21943,7 +21943,7 @@ glabel func0f0ecc98 /* f0ece00: 8fbf0014 */ lw $ra,0x14($sp) .L0f0ece04: /* f0ece04: 3c04800a */ lui $a0,0x800a -/* f0ece08: 0fc5b9f1 */ jal textGet +/* f0ece08: 0fc5b9f1 */ jal langGet /* f0ece0c: 9484dfc8 */ lhu $a0,-0x2038($a0) /* f0ece10: 8fbf0014 */ lw $ra,0x14($sp) .L0f0ece14: @@ -22992,7 +22992,7 @@ glabel func0f0edb6c /* f0edcd8: 2415ff00 */ addiu $s5,$zero,-256 /* f0edcdc: 15e0002a */ bnez $t7,.L0f0edd88 /* f0edce0: 00000000 */ sll $zero,$zero,0x0 -/* f0edce4: 0fc5b9f1 */ jal textGet +/* f0edce4: 0fc5b9f1 */ jal langGet /* f0edce8: 24045115 */ addiu $a0,$zero,0x5115 /* f0edcec: 3c128008 */ lui $s2,%hi(var8007fb04) /* f0edcf0: 2652fb04 */ addiu $s2,$s2,%lo(var8007fb04) @@ -23014,7 +23014,7 @@ glabel func0f0edb6c /* f0edd30: afaa00b4 */ sw $t2,0xb4($sp) /* f0edd34: 87cc0002 */ lh $t4,0x2($s8) /* f0edd38: 258b0001 */ addiu $t3,$t4,0x1 -/* f0edd3c: 0fc5b9f1 */ jal textGet +/* f0edd3c: 0fc5b9f1 */ jal langGet /* f0edd40: afab00b0 */ sw $t3,0xb0($sp) /* f0edd44: 8e2d0000 */ lw $t5,0x0($s1) /* f0edd48: 8e4e0000 */ lw $t6,0x0($s2) @@ -23038,7 +23038,7 @@ glabel func0f0edb6c /* f0edd8c: 3c128008 */ lui $s2,%hi(var8007fb04) /* f0edd90: 2652fb04 */ addiu $s2,$s2,%lo(var8007fb04) /* f0edd94: 2631fb08 */ addiu $s1,$s1,%lo(var8007fb08) -/* f0edd98: 0fc5b9f1 */ jal textGet +/* f0edd98: 0fc5b9f1 */ jal langGet /* f0edd9c: 24045116 */ addiu $a0,$zero,0x5116 /* f0edda0: 8e590000 */ lw $t9,0x0($s2) /* f0edda4: 27a400a4 */ addiu $a0,$sp,0xa4 @@ -23056,7 +23056,7 @@ glabel func0f0edb6c /* f0eddd4: afac00b4 */ sw $t4,0xb4($sp) /* f0eddd8: 87cb0002 */ lh $t3,0x2($s8) /* f0edddc: 256d0001 */ addiu $t5,$t3,0x1 -/* f0edde0: 0fc5b9f1 */ jal textGet +/* f0edde0: 0fc5b9f1 */ jal langGet /* f0edde4: afad00b0 */ sw $t5,0xb0($sp) /* f0edde8: 8e2e0000 */ lw $t6,0x0($s1) /* f0eddec: 8e4f0000 */ lw $t7,0x0($s2) @@ -23847,7 +23847,7 @@ glabel func0f0ee648 /* f0ee964: 01ae8025 */ or $s0,$t5,$t6 /* f0ee968: afb000b8 */ sw $s0,0xb8($sp) .L0f0ee96c: -/* f0ee96c: 0fc5b9f1 */ jal textGet +/* f0ee96c: 0fc5b9f1 */ jal langGet /* f0ee970: 24045119 */ addiu $a0,$zero,0x5119 /* f0ee974: 3c0f8008 */ lui $t7,0x8008 /* f0ee978: 8deffb04 */ lw $t7,-0x4fc($t7) @@ -23868,7 +23868,7 @@ glabel func0f0ee648 /* f0ee9b4: afab00c0 */ sw $t3,0xc0($sp) /* f0ee9b8: 86390002 */ lh $t9,0x2($s1) /* f0ee9bc: 272c0001 */ addiu $t4,$t9,0x1 -/* f0ee9c0: 0fc5b9f1 */ jal textGet +/* f0ee9c0: 0fc5b9f1 */ jal langGet /* f0ee9c4: afac00bc */ sw $t4,0xbc($sp) /* f0ee9c8: 3c098008 */ lui $t1,0x8008 /* f0ee9cc: 3c0d8008 */ lui $t5,0x8008 @@ -23994,7 +23994,7 @@ glabel func0f0ee648 /* f0eeba4: 01cf8025 */ or $s0,$t6,$t7 /* f0eeba8: afb000b8 */ sw $s0,0xb8($sp) .L0f0eebac: -/* f0eebac: 0fc5b9f1 */ jal textGet +/* f0eebac: 0fc5b9f1 */ jal langGet /* f0eebb0: 2404511a */ addiu $a0,$zero,0x511a /* f0eebb4: 3c188008 */ lui $t8,0x8008 /* f0eebb8: 8f18fb04 */ lw $t8,-0x4fc($t8) @@ -24015,7 +24015,7 @@ glabel func0f0ee648 /* f0eebf4: afb900c0 */ sw $t9,0xc0($sp) /* f0eebf8: 862c0002 */ lh $t4,0x2($s1) /* f0eebfc: 01924821 */ addu $t1,$t4,$s2 -/* f0eec00: 0fc5b9f1 */ jal textGet +/* f0eec00: 0fc5b9f1 */ jal langGet /* f0eec04: afa900bc */ sw $t1,0xbc($sp) /* f0eec08: 3c0d8008 */ lui $t5,0x8008 /* f0eec0c: 3c0e8008 */ lui $t6,0x8008 @@ -24036,7 +24036,7 @@ glabel func0f0ee648 /* f0eec48: 0fc5580f */ jal func0f15603c /* f0eec4c: afb80020 */ sw $t8,0x20($sp) /* f0eec50: 0040a025 */ or $s4,$v0,$zero -/* f0eec54: 0fc5b9f1 */ jal textGet +/* f0eec54: 0fc5b9f1 */ jal langGet /* f0eec58: 2404511b */ addiu $a0,$zero,0x511b /* f0eec5c: 3c088008 */ lui $t0,0x8008 /* f0eec60: 8d08fb04 */ lw $t0,-0x4fc($t0) @@ -24056,7 +24056,7 @@ glabel func0f0ee648 /* f0eec98: afac00c0 */ sw $t4,0xc0($sp) /* f0eec9c: 86290002 */ lh $t1,0x2($s1) /* f0eeca0: 01326821 */ addu $t5,$t1,$s2 -/* f0eeca4: 0fc5b9f1 */ jal textGet +/* f0eeca4: 0fc5b9f1 */ jal langGet /* f0eeca8: afad00bc */ sw $t5,0xbc($sp) /* f0eecac: 3c0e8008 */ lui $t6,0x8008 /* f0eecb0: 3c0f8008 */ lui $t7,0x8008 @@ -25151,7 +25151,7 @@ glabel func0f0efbb4 /* f0efc80: 030e7821 */ addu $t7,$t8,$t6 /* f0efc84: 25e8004c */ addiu $t0,$t7,0x4c /* f0efc88: afa80094 */ sw $t0,0x94($sp) -/* f0efc8c: 0fc5b9f1 */ jal textGet +/* f0efc8c: 0fc5b9f1 */ jal langGet /* f0efc90: 94840074 */ lhu $a0,0x74($a0) /* f0efc94: 0c002f02 */ jal func0000bc08 /* f0efc98: 00409025 */ or $s2,$v0,$zero @@ -25220,7 +25220,7 @@ glabel func0f0efbb4 /* f0efd7c: 02214025 */ or $t0,$s1,$at /* f0efd80: 01008825 */ or $s1,$t0,$zero .L0f0efd84: -/* f0efd84: 0fc5b9f1 */ jal textGet +/* f0efd84: 0fc5b9f1 */ jal langGet /* f0efd88: 00000000 */ sll $zero,$zero,0x0 /* f0efd8c: 0c002f02 */ jal func0000bc08 /* f0efd90: 00409025 */ or $s2,$v0,$zero @@ -25534,7 +25534,7 @@ glabel func0f0eff78 /* f0f0214: 2f210004 */ sltiu $at,$t9,0x4 /* f0f0218: 1420001f */ bnez $at,.L0f0f0298 /* f0f021c: 00000000 */ sll $zero,$zero,0x0 -/* f0f0220: 0fc5b9f1 */ jal textGet +/* f0f0220: 0fc5b9f1 */ jal langGet /* f0f0224: 240454d5 */ addiu $a0,$zero,0x54d5 /* f0f0228: 3c098007 */ lui $t1,0x8007 /* f0f022c: 8d291448 */ lw $t1,0x1448($t1) @@ -25552,10 +25552,10 @@ glabel func0f0eff78 /* f0f025c: afa2004c */ sw $v0,0x4c($sp) /* f0f0260: 000a6040 */ sll $t4,$t2,0x1 /* f0f0264: 008c2021 */ addu $a0,$a0,$t4 -/* f0f0268: 0fc5b9f1 */ jal textGet +/* f0f0268: 0fc5b9f1 */ jal langGet /* f0f026c: 948419d0 */ lhu $a0,0x19d0($a0) /* f0f0270: afa20050 */ sw $v0,0x50($sp) -/* f0f0274: 0fc5b9f1 */ jal textGet +/* f0f0274: 0fc5b9f1 */ jal langGet /* f0f0278: 240454d7 */ addiu $a0,$zero,0x54d7 /* f0f027c: 27a4006c */ addiu $a0,$sp,0x6c /* f0f0280: 8fa5004c */ lw $a1,0x4c($sp) @@ -25565,7 +25565,7 @@ glabel func0f0eff78 /* f0f0290: 1000001e */ beqz $zero,.L0f0f030c /* f0f0294: 8fa200a4 */ lw $v0,0xa4($sp) .L0f0f0298: -/* f0f0298: 0fc5b9f1 */ jal textGet +/* f0f0298: 0fc5b9f1 */ jal langGet /* f0f029c: 240454d5 */ addiu $a0,$zero,0x54d5 /* f0f02a0: 3c0d8007 */ lui $t5,0x8007 /* f0f02a4: 8dad1448 */ lw $t5,0x1448($t5) @@ -25583,10 +25583,10 @@ glabel func0f0eff78 /* f0f02d4: afa2004c */ sw $v0,0x4c($sp) /* f0f02d8: 000fc040 */ sll $t8,$t7,0x1 /* f0f02dc: 00982021 */ addu $a0,$a0,$t8 -/* f0f02e0: 0fc5b9f1 */ jal textGet +/* f0f02e0: 0fc5b9f1 */ jal langGet /* f0f02e4: 948419d0 */ lhu $a0,0x19d0($a0) /* f0f02e8: afa20050 */ sw $v0,0x50($sp) -/* f0f02ec: 0fc5b9f1 */ jal textGet +/* f0f02ec: 0fc5b9f1 */ jal langGet /* f0f02f0: 240454d6 */ addiu $a0,$zero,0x54d6 /* f0f02f4: 27a4006c */ addiu $a0,$sp,0x6c /* f0f02f8: 8fa5004c */ lw $a1,0x4c($sp) @@ -25718,7 +25718,7 @@ glabel func0f0eff78 /* f0f04e8: 0fc54d8a */ jal func0f153628 /* f0f04ec: afb9008c */ sw $t9,0x8c($sp) /* f0f04f0: afa200a0 */ sw $v0,0xa0($sp) -/* f0f04f4: 0fc5b9f1 */ jal textGet +/* f0f04f4: 0fc5b9f1 */ jal langGet /* f0f04f8: 240454d8 */ addiu $a0,$zero,0x54d8 /* f0f04fc: 0c002f02 */ jal func0000bc08 /* f0f0500: 00408025 */ or $s0,$v0,$zero diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 1adb95133..c9e616838 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -808,7 +808,7 @@ glabel func0f0f0ce8 /* f0f0d64: afa20040 */ sw $v0,0x40($sp) /* f0f0d68: afb90084 */ sw $t9,0x84($sp) /* f0f0d6c: afa30064 */ sw $v1,0x64($sp) -/* f0f0d70: 0fc5b9f1 */ jal textGet +/* f0f0d70: 0fc5b9f1 */ jal langGet /* f0f0d74: afa80060 */ sw $t0,0x60($sp) /* f0f0d78: 8fac0060 */ lw $t4,0x60($sp) /* f0f0d7c: 27a4007c */ addiu $a0,$sp,0x7c @@ -818,7 +818,7 @@ glabel func0f0f0ce8 /* f0f0d8c: afa00014 */ sw $zero,0x14($sp) /* f0f0d90: 0fc55cbe */ jal func0f1572f8 /* f0f0d94: afac0010 */ sw $t4,0x10($sp) -/* f0f0d98: 0fc5b9f1 */ jal textGet +/* f0f0d98: 0fc5b9f1 */ jal langGet /* f0f0d9c: 240451ef */ addiu $a0,$zero,0x51ef /* f0f0da0: 8fad0060 */ lw $t5,0x60($sp) /* f0f0da4: 27a40074 */ addiu $a0,$sp,0x74 @@ -1002,7 +1002,7 @@ glabel func0f0f0ce8 /* f0f105c: 24c60002 */ addiu $a2,$a2,0x2 /* f0f1060: 95e40000 */ lhu $a0,0x0($t7) /* f0f1064: afa60084 */ sw $a2,0x84($sp) -/* f0f1068: 0fc5b9f1 */ jal textGet +/* f0f1068: 0fc5b9f1 */ jal langGet /* f0f106c: afa30044 */ sw $v1,0x44($sp) /* f0f1070: 0c002f02 */ jal func0000bc08 /* f0f1074: afa2004c */ sw $v0,0x4c($sp) @@ -1039,7 +1039,7 @@ glabel func0f0f0ce8 /* f0f10ec: 24c60003 */ addiu $a2,$a2,0x3 /* f0f10f0: afaf0088 */ sw $t7,0x88($sp) /* f0f10f4: afa60084 */ sw $a2,0x84($sp) -/* f0f10f8: 0fc5b9f1 */ jal textGet +/* f0f10f8: 0fc5b9f1 */ jal langGet /* f0f10fc: 240451ef */ addiu $a0,$zero,0x51ef /* f0f1100: 0c002f02 */ jal func0000bc08 /* f0f1104: afa2004c */ sw $v0,0x4c($sp) @@ -1075,7 +1075,7 @@ glabel func0f0f0ce8 /* f0f1178: 014d6023 */ subu $t4,$t2,$t5 /* f0f117c: afac0088 */ sw $t4,0x88($sp) /* f0f1180: 95e40000 */ lhu $a0,0x0($t7) -/* f0f1184: 0fc5b9f1 */ jal textGet +/* f0f1184: 0fc5b9f1 */ jal langGet /* f0f1188: afa60084 */ sw $a2,0x84($sp) /* f0f118c: 0c002f02 */ jal func0000bc08 /* f0f1190: afa2004c */ sw $v0,0x4c($sp) @@ -1112,7 +1112,7 @@ glabel func0f0f0ce8 /* f0f1208: 012d6023 */ subu $t4,$t1,$t5 /* f0f120c: afac0088 */ sw $t4,0x88($sp) /* f0f1210: afa60084 */ sw $a2,0x84($sp) -/* f0f1214: 0fc5b9f1 */ jal textGet +/* f0f1214: 0fc5b9f1 */ jal langGet /* f0f1218: 240451ef */ addiu $a0,$zero,0x51ef /* f0f121c: 0c002f02 */ jal func0000bc08 /* f0f1220: afa2004c */ sw $v0,0x4c($sp) @@ -1336,7 +1336,7 @@ glabel func0f0f14e4 /* f0f14fc: 2cc15a00 */ sltiu $at,$a2,0x5a00 /* f0f1500: 10200005 */ beqz $at,.L0f0f1518 /* f0f1504: 3c0e7f1a */ lui $t6,0x7f1a -/* f0f1508: 0fc5b9f1 */ jal textGet +/* f0f1508: 0fc5b9f1 */ jal langGet /* f0f150c: 00c02025 */ or $a0,$a2,$zero /* f0f1510: 1000000f */ beqz $zero,.L0f0f1550 /* f0f1514: 8fbf0014 */ lw $ra,0x14($sp) @@ -13519,10 +13519,10 @@ glabel func0f0fbc30 /* f0fc2f4: 24100001 */ addiu $s0,$zero,0x1 /* f0fc2f8: 5180000f */ beqzl $t4,.L0f0fc338 /* f0fc2fc: 8eeb0004 */ lw $t3,0x4($s7) -/* f0fc300: 0fc5b9f1 */ jal textGet +/* f0fc300: 0fc5b9f1 */ jal langGet /* f0fc304: 240451e2 */ addiu $a0,$zero,0x51e2 /* f0fc308: 00408825 */ or $s1,$v0,$zero -/* f0fc30c: 0fc5b9f1 */ jal textGet +/* f0fc30c: 0fc5b9f1 */ jal langGet /* f0fc310: 240459cd */ addiu $a0,$zero,0x59cd /* f0fc314: 3c057f1b */ lui $a1,%hi(var7f1b2794) /* f0fc318: 24a52794 */ addiu $a1,$a1,%lo(var7f1b2794) @@ -13560,10 +13560,10 @@ glabel func0f0fbc30 /* f0fc388: 10000001 */ beqz $zero,.L0f0fc390 /* f0fc38c: 01c08025 */ or $s0,$t6,$zero .L0f0fc390: -/* f0fc390: 0fc5b9f1 */ jal textGet +/* f0fc390: 0fc5b9f1 */ jal langGet /* f0fc394: 240451e2 */ addiu $a0,$zero,0x51e2 /* f0fc398: 00408825 */ or $s1,$v0,$zero -/* f0fc39c: 0fc5b9f1 */ jal textGet +/* f0fc39c: 0fc5b9f1 */ jal langGet /* f0fc3a0: 240451e3 */ addiu $a0,$zero,0x51e3 /* f0fc3a4: 3c057f1b */ lui $a1,%hi(var7f1b279c) /* f0fc3a8: 24a5279c */ addiu $a1,$a1,%lo(var7f1b279c) @@ -13675,7 +13675,7 @@ glabel func0f0fbc30 /* f0fc534: 00000000 */ sll $zero,$zero,0x0 .L0f0fc538: /* f0fc538: 44cdf800 */ ctc1 $t5,$31 -/* f0fc53c: 0fc5b9f1 */ jal textGet +/* f0fc53c: 0fc5b9f1 */ jal langGet /* f0fc540: afae00a0 */ sw $t6,0xa0($sp) /* f0fc544: 02802025 */ or $a0,$s4,$zero /* f0fc548: 00402825 */ or $a1,$v0,$zero @@ -13742,7 +13742,7 @@ glabel func0f0fbc30 /* f0fc628: 81f80494 */ lb $t8,0x494($t7) /* f0fc62c: 1300000c */ beqz $t8,.L0f0fc660 /* f0fc630: 00000000 */ sll $zero,$zero,0x0 -/* f0fc634: 0fc5b9f1 */ jal textGet +/* f0fc634: 0fc5b9f1 */ jal langGet /* f0fc638: 240459cd */ addiu $a0,$zero,0x59cd /* f0fc63c: 02802025 */ or $a0,$s4,$zero /* f0fc640: 0c004c4c */ jal strcpy @@ -13754,7 +13754,7 @@ glabel func0f0fbc30 /* f0fc658: 1000000d */ beqz $zero,.L0f0fc690 /* f0fc65c: 03201825 */ or $v1,$t9,$zero .L0f0fc660: -/* f0fc660: 0fc5b9f1 */ jal textGet +/* f0fc660: 0fc5b9f1 */ jal langGet /* f0fc664: 240451e3 */ addiu $a0,$zero,0x51e3 /* f0fc668: 02802025 */ or $a0,$s4,$zero /* f0fc66c: 0c004c4c */ jal strcpy @@ -14452,7 +14452,7 @@ glabel func0f0fcfb8 /* f0fd01c: 10200006 */ beqz $at,.L0f0fd038 /* f0fd020: 00025040 */ sll $t2,$v0,0x1 /* f0fd024: 006a5821 */ addu $t3,$v1,$t2 -/* f0fd028: 0fc5b9f1 */ jal textGet +/* f0fd028: 0fc5b9f1 */ jal langGet /* f0fd02c: 95640000 */ lhu $a0,0x0($t3) /* f0fd030: 10000003 */ beqz $zero,.L0f0fd040 /* f0fd034: 8fbf0014 */ lw $ra,0x14($sp) @@ -15715,7 +15715,7 @@ glabel func0f0fe280 /* f0fe2cc: 24010004 */ addiu $at,$zero,0x4 /* f0fe2d0: 54e10009 */ bnel $a3,$at,.L0f0fe2f8 /* f0fe2d4: 28e10005 */ slti $at,$a3,0x5 -/* f0fe2d8: 0fc5b9f1 */ jal textGet +/* f0fe2d8: 0fc5b9f1 */ jal langGet /* f0fe2dc: 240458aa */ addiu $a0,$zero,0x58aa /* f0fe2e0: 8fa40038 */ lw $a0,0x38($sp) /* f0fe2e4: 0c004c4c */ jal strcpy @@ -15817,7 +15817,7 @@ glabel func0f0fe280 /* f0fe448: 00000000 */ sll $zero,$zero,0x0 /* f0fe44c: 0006000d */ break 0x6 .L0f0fe450: -/* f0fe450: 0fc5b9f1 */ jal textGet +/* f0fe450: 0fc5b9f1 */ jal langGet /* f0fe454: 00000000 */ sll $zero,$zero,0x0 /* f0fe458: 8fad0020 */ lw $t5,0x20($sp) /* f0fe45c: 8fa70030 */ lw $a3,0x30($sp) @@ -15900,7 +15900,7 @@ glabel func0f0fe280 /* f0fe578: 24010004 */ addiu $at,$zero,0x4 /* f0fe57c: 54e10009 */ bnel $a3,$at,.L0f0fe5a4 /* f0fe580: 24010001 */ addiu $at,$zero,0x1 -/* f0fe584: 0fc5b9f1 */ jal textGet +/* f0fe584: 0fc5b9f1 */ jal langGet /* f0fe588: 240458ab */ addiu $a0,$zero,0x58ab /* f0fe58c: 8fa40038 */ lw $a0,0x38($sp) /* f0fe590: 0c004c4c */ jal strcpy @@ -15968,7 +15968,7 @@ glabel func0f0fe280 .L0f0fe678: /* f0fe678: 51000070 */ beqzl $t0,.L0f0fe83c /* f0fe67c: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fe680: 0fc5b9f1 */ jal textGet +/* f0fe680: 0fc5b9f1 */ jal langGet /* f0fe684: 95040004 */ lhu $a0,0x4($t0) /* f0fe688: 8fa40038 */ lw $a0,0x38($sp) /* f0fe68c: 0c004c4c */ jal strcpy @@ -16009,7 +16009,7 @@ glabel func0f0fe280 .L0f0fe710: /* f0fe710: 5040004a */ beqzl $v0,.L0f0fe83c /* f0fe714: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fe718: 0fc5b9f1 */ jal textGet +/* f0fe718: 0fc5b9f1 */ jal langGet /* f0fe71c: 94a40004 */ lhu $a0,0x4($a1) /* f0fe720: 8fa40038 */ lw $a0,0x38($sp) /* f0fe724: 0c004c4c */ jal strcpy @@ -16030,7 +16030,7 @@ glabel func0f0fe280 /* f0fe75c: 24010004 */ addiu $at,$zero,0x4 /* f0fe760: 54e10009 */ bnel $a3,$at,.L0f0fe788 /* f0fe764: 24010001 */ addiu $at,$zero,0x1 -/* f0fe768: 0fc5b9f1 */ jal textGet +/* f0fe768: 0fc5b9f1 */ jal langGet /* f0fe76c: 240459da */ addiu $a0,$zero,0x59da /* f0fe770: 8fa40038 */ lw $a0,0x38($sp) /* f0fe774: 0c004c4c */ jal strcpy @@ -16041,7 +16041,7 @@ glabel func0f0fe280 .L0f0fe788: /* f0fe788: 54e10009 */ bnel $a3,$at,.L0f0fe7b0 /* f0fe78c: 24010007 */ addiu $at,$zero,0x7 -/* f0fe790: 0fc5b9f1 */ jal textGet +/* f0fe790: 0fc5b9f1 */ jal langGet /* f0fe794: 240459d8 */ addiu $a0,$zero,0x59d8 /* f0fe798: 8fa40038 */ lw $a0,0x38($sp) /* f0fe79c: 0c004c4c */ jal strcpy @@ -16052,7 +16052,7 @@ glabel func0f0fe280 .L0f0fe7b0: /* f0fe7b0: 54e10009 */ bnel $a3,$at,.L0f0fe7d8 /* f0fe7b4: 24010003 */ addiu $at,$zero,0x3 -/* f0fe7b8: 0fc5b9f1 */ jal textGet +/* f0fe7b8: 0fc5b9f1 */ jal langGet /* f0fe7bc: 240459d9 */ addiu $a0,$zero,0x59d9 /* f0fe7c0: 8fa40038 */ lw $a0,0x38($sp) /* f0fe7c4: 0c004c4c */ jal strcpy @@ -16063,7 +16063,7 @@ glabel func0f0fe280 .L0f0fe7d8: /* f0fe7d8: 54e10018 */ bnel $a3,$at,.L0f0fe83c /* f0fe7dc: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fe7e0: 0fc5b9f1 */ jal textGet +/* f0fe7e0: 0fc5b9f1 */ jal langGet /* f0fe7e4: 240459db */ addiu $a0,$zero,0x59db /* f0fe7e8: 8fa40038 */ lw $a0,0x38($sp) /* f0fe7ec: 0c004c4c */ jal strcpy @@ -16073,7 +16073,7 @@ glabel func0f0fe280 .L0f0fe7fc: /* f0fe7fc: 14e10008 */ bne $a3,$at,.L0f0fe820 /* f0fe800: 3c04800b */ lui $a0,0x800b -/* f0fe804: 0fc5b9f1 */ jal textGet +/* f0fe804: 0fc5b9f1 */ jal langGet /* f0fe808: 240458ac */ addiu $a0,$zero,0x58ac /* f0fe80c: 8fa40038 */ lw $a0,0x38($sp) /* f0fe810: 0c004c4c */ jal strcpy @@ -17341,7 +17341,7 @@ glabel func0f0ff7bc /* f0ffa28: 14200005 */ bnez $at,.L0f0ffa40 /* f0ffa2c: 00000000 */ sll $zero,$zero,0x0 .L0f0ffa30: -/* f0ffa30: 0fc5b9f1 */ jal textGet +/* f0ffa30: 0fc5b9f1 */ jal langGet /* f0ffa34: 240458ad */ addiu $a0,$zero,0x58ad /* f0ffa38: 10000004 */ beqz $zero,.L0f0ffa4c /* f0ffa3c: afa20080 */ sw $v0,0x80($sp) @@ -17664,7 +17664,7 @@ glabel func0f0ff7bc /* f0ffec4: 10000093 */ beqz $zero,.L0f100114 /* f0ffec8: adaf1c04 */ sw $t7,0x1c04($t5) .L0f0ffecc: -/* f0ffecc: 0fc5b9f1 */ jal textGet +/* f0ffecc: 0fc5b9f1 */ jal langGet /* f0ffed0: 240458d7 */ addiu $a0,$zero,0x58d7 /* f0ffed4: 3c19800a */ lui $t9,0x800a /* f0ffed8: 8f3921b4 */ lw $t9,0x21b4($t9) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index bbb724a88..a4a6f2705 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -144,7 +144,7 @@ glabel func0f102240 /* f10225c: 3c048007 */ lui $a0,0x8007 /* f102260: afbf0014 */ sw $ra,0x14($sp) /* f102264: 008f2021 */ addu $a0,$a0,$t7 -/* f102268: 0fc5b9f1 */ jal textGet +/* f102268: 0fc5b9f1 */ jal langGet /* f10226c: 94841e76 */ lhu $a0,0x1e76($a0) /* f102270: 3c048007 */ lui $a0,0x8007 /* f102274: 3c057f1b */ lui $a1,%hi(var7f1b2cf0) @@ -162,17 +162,17 @@ glabel func0f102240 char *menutextDifficulty(s32 arg0) { if (g_MissionConfig.pdmode) { - return textGet(0x54dd); + return langGet(0x54dd); } switch (g_MissionConfig.difficulty) { case DIFF_SA: - return textGet(0x56fc); + return langGet(0x56fc); case DIFF_PA: - return textGet(0x56fd); + return langGet(0x56fd); case DIFF_A: default: - return textGet(0x56fb); + return langGet(0x56fb); } } @@ -216,14 +216,14 @@ glabel func0f102330 /* f1023b4: 3c048007 */ lui $a0,0x8007 /* f1023b8: 00187840 */ sll $t7,$t8,0x1 /* f1023bc: 008f2021 */ addu $a0,$a0,$t7 -/* f1023c0: 0fc5b9f1 */ jal textGet +/* f1023c0: 0fc5b9f1 */ jal langGet /* f1023c4: 948419d0 */ lhu $a0,0x19d0($a0) /* f1023c8: 10000041 */ beqz $zero,.L0f1024d0 /* f1023cc: 8fbf0014 */ lw $ra,0x14($sp) /* f1023d0: 8cce0000 */ lw $t6,0x0($a2) /* f1023d4: 000ec840 */ sll $t9,$t6,0x1 /* f1023d8: 00794021 */ addu $t0,$v1,$t9 -/* f1023dc: 0fc5b9f1 */ jal textGet +/* f1023dc: 0fc5b9f1 */ jal langGet /* f1023e0: 95040000 */ lhu $a0,0x0($t0) /* f1023e4: 1000003a */ beqz $zero,.L0f1024d0 /* f1023e8: 8fbf0014 */ lw $ra,0x14($sp) @@ -366,7 +366,7 @@ glabel menuhandlerAimControl /* f102638: 8ccb0000 */ lw $t3,0x0($a2) /* f10263c: 000b6040 */ sll $t4,$t3,0x1 /* f102640: 006c6821 */ addu $t5,$v1,$t4 -/* f102644: 0fc5b9f1 */ jal textGet +/* f102644: 0fc5b9f1 */ jal langGet /* f102648: 95a40000 */ lhu $a0,0x0($t5) /* f10264c: 1000000f */ beqz $zero,.L0f10268c /* f102650: 8fbf0014 */ lw $ra,0x14($sp) @@ -425,7 +425,7 @@ glabel menuhandlerSoundMode /* f1026f8: 8cc90000 */ lw $t1,0x0($a2) /* f1026fc: 00095040 */ sll $t2,$t1,0x1 /* f102700: 004a5821 */ addu $t3,$v0,$t2 -/* f102704: 0fc5b9f1 */ jal textGet +/* f102704: 0fc5b9f1 */ jal langGet /* f102708: 95640000 */ lhu $a0,0x0($t3) /* f10270c: 1000000e */ beqz $zero,.L0f102748 /* f102710: 8fbf0014 */ lw $ra,0x14($sp) @@ -483,7 +483,7 @@ glabel menuhandlerScreenSize /* f1027b4: 8cc90000 */ lw $t1,0x0($a2) /* f1027b8: 00095040 */ sll $t2,$t1,0x1 /* f1027bc: 004a5821 */ addu $t3,$v0,$t2 -/* f1027c0: 0fc5b9f1 */ jal textGet +/* f1027c0: 0fc5b9f1 */ jal langGet /* f1027c4: 95640000 */ lhu $a0,0x0($t3) /* f1027c8: 1000000f */ beqz $zero,.L0f102808 /* f1027cc: 8fbf0014 */ lw $ra,0x14($sp) @@ -540,7 +540,7 @@ glabel menuhandlerScreenRatio /* f10286c: 8cc90000 */ lw $t1,0x0($a2) /* f102870: 00095040 */ sll $t2,$t1,0x1 /* f102874: 004a5821 */ addu $t3,$v0,$t2 -/* f102878: 0fc5b9f1 */ jal textGet +/* f102878: 0fc5b9f1 */ jal langGet /* f10287c: 95640000 */ lhu $a0,0x0($t3) /* f102880: 1000000f */ beqz $zero,.L0f1028c0 /* f102884: 8fbf0014 */ lw $ra,0x14($sp) @@ -597,7 +597,7 @@ glabel menuhandlerScreenSplit /* f102924: 8cc90000 */ lw $t1,0x0($a2) /* f102928: 00095040 */ sll $t2,$t1,0x1 /* f10292c: 004a5821 */ addu $t3,$v0,$t2 -/* f102930: 0fc5b9f1 */ jal textGet +/* f102930: 0fc5b9f1 */ jal langGet /* f102934: 95640000 */ lhu $a0,0x0($t3) /* f102938: 1000003e */ beqz $zero,.L0f102a34 /* f10293c: 8fbf0014 */ lw $ra,0x14($sp) @@ -1218,7 +1218,7 @@ glabel func0f103550 /* f10358c: 8f190000 */ lw $t9,0x0($t8) /* f103590: 10990005 */ beq $a0,$t9,.L0f1035a8 /* f103594: 00000000 */ sll $zero,$zero,0x0 -/* f103598: 0fc5b9f1 */ jal textGet +/* f103598: 0fc5b9f1 */ jal langGet /* f10359c: 24045711 */ addiu $a0,$zero,0x5711 /* f1035a0: 10000016 */ beqz $zero,.L0f1035fc /* f1035a4: 8fbf0014 */ lw $ra,0x14($sp) @@ -1229,10 +1229,10 @@ glabel func0f103550 /* f1035b4: 01284823 */ subu $t1,$t1,$t0 /* f1035b8: 00094880 */ sll $t1,$t1,0x2 /* f1035bc: 00892021 */ addu $a0,$a0,$t1 -/* f1035c0: 0fc5b9f1 */ jal textGet +/* f1035c0: 0fc5b9f1 */ jal langGet /* f1035c4: 94841e76 */ lhu $a0,0x1e76($a0) /* f1035c8: afa20018 */ sw $v0,0x18($sp) -/* f1035cc: 0fc5b9f1 */ jal textGet +/* f1035cc: 0fc5b9f1 */ jal langGet /* f1035d0: 24045711 */ addiu $a0,$zero,0x5711 /* f1035d4: 3c048007 */ lui $a0,0x8007 /* f1035d8: 3c057f1b */ lui $a1,%hi(var7f1b2cf4) @@ -1288,7 +1288,7 @@ glabel menudialog00103608 /* f103688: 8fbf0014 */ lw $ra,0x14($sp) .L0f10368c: /* f10368c: 3c04800a */ lui $a0,0x800a -/* f103690: 0fc5b9ec */ jal textClearBank +/* f103690: 0fc5b9ec */ jal langClearBank /* f103694: 9484dfe2 */ lhu $a0,-0x201e($a0) /* f103698: 8fbf0014 */ lw $ra,0x14($sp) .L0f10369c: @@ -2142,7 +2142,7 @@ glabel menuhandlerCoopBuddy /* f104360: 00187040 */ sll $t6,$t8,0x1 /* f104364: 01cf4021 */ addu $t0,$t6,$t7 /* f104368: 03a82021 */ addu $a0,$sp,$t0 -/* f10436c: 0fc5b9f1 */ jal textGet +/* f10436c: 0fc5b9f1 */ jal langGet /* f104370: 94840034 */ lhu $a0,0x34($a0) /* f104374: 10000027 */ beqz $zero,.L0f104414 /* f104378: 8fbf0014 */ lw $ra,0x14($sp) @@ -2240,7 +2240,7 @@ glabel menuhandlerAntiPlayer /* f1044e0: 8cc90000 */ lw $t1,0x0($a2) /* f1044e4: 00095040 */ sll $t2,$t1,0x1 /* f1044e8: 004a5821 */ addu $t3,$v0,$t2 -/* f1044ec: 0fc5b9f1 */ jal textGet +/* f1044ec: 0fc5b9f1 */ jal langGet /* f1044f0: 95640000 */ lhu $a0,0x0($t3) /* f1044f4: 1000000d */ beqz $zero,.L0f10452c /* f1044f8: 8fbf0014 */ lw $ra,0x14($sp) @@ -2494,7 +2494,7 @@ glabel menuhandler0010476c /* f1048f4: 01c37023 */ subu $t6,$t6,$v1 /* f1048f8: 000e7080 */ sll $t6,$t6,0x2 /* f1048fc: 008e2021 */ addu $a0,$a0,$t6 -/* f104900: 0fc5b9f1 */ jal textGet +/* f104900: 0fc5b9f1 */ jal langGet /* f104904: 94841e72 */ lhu $a0,0x1e72($a0) /* f104908: 10000320 */ beqz $zero,.L0f10558c /* f10490c: 8fbf003c */ lw $ra,0x3c($sp) @@ -2506,7 +2506,7 @@ glabel menuhandler0010476c /* f104920: 0018c080 */ sll $t8,$t8,0x2 /* f104924: 3c048007 */ lui $a0,0x8007 /* f104928: 00982021 */ addu $a0,$a0,$t8 -/* f10492c: 0fc5b9f1 */ jal textGet +/* f10492c: 0fc5b9f1 */ jal langGet /* f104930: 94841e72 */ lhu $a0,0x1e72($a0) /* f104934: 10000315 */ beqz $zero,.L0f10558c /* f104938: 8fbf003c */ lw $ra,0x3c($sp) @@ -2662,12 +2662,12 @@ glabel menuhandler0010476c /* f104b74: 0003c0c0 */ sll $t8,$v1,0x3 /* f104b78: 146f0005 */ bne $v1,$t7,.L0f104b90 /* f104b7c: 00587021 */ addu $t6,$v0,$t8 -/* f104b80: 0fc5b9f1 */ jal textGet +/* f104b80: 0fc5b9f1 */ jal langGet /* f104b84: 97a401f4 */ lhu $a0,0x1f4($sp) /* f104b88: 10000280 */ beqz $zero,.L0f10558c /* f104b8c: 8fbf003c */ lw $ra,0x3c($sp) .L0f104b90: -/* f104b90: 0fc5b9f1 */ jal textGet +/* f104b90: 0fc5b9f1 */ jal langGet /* f104b94: 95c40004 */ lhu $a0,0x4($t6) /* f104b98: 1000027c */ beqz $zero,.L0f10558c /* f104b9c: 8fbf003c */ lw $ra,0x3c($sp) @@ -3251,7 +3251,7 @@ glabel menuhandler0010476c /* f10545c: 03381821 */ addu $v1,$t9,$t8 /* f105460: afa20138 */ sw $v0,0x138($sp) /* f105464: 94640006 */ lhu $a0,0x6($v1) -/* f105468: 0fc5b9f1 */ jal textGet +/* f105468: 0fc5b9f1 */ jal langGet /* f10546c: afa3004c */ sw $v1,0x4c($sp) /* f105470: 27a400f0 */ addiu $a0,$sp,0xf0 /* f105474: 0c004c4c */ jal strcpy @@ -3286,7 +3286,7 @@ glabel menuhandler0010476c /* f1054e8: afb80018 */ sw $t8,0x18($sp) /* f1054ec: 8faf004c */ lw $t7,0x4c($sp) /* f1054f0: afa20138 */ sw $v0,0x138($sp) -/* f1054f4: 0fc5b9f1 */ jal textGet +/* f1054f4: 0fc5b9f1 */ jal langGet /* f1054f8: 95e40008 */ lhu $a0,0x8($t7) /* f1054fc: 27a400f0 */ addiu $a0,$sp,0xf0 /* f105500: 0c004c4c */ jal strcpy @@ -3480,10 +3480,10 @@ char *func0f105864(s32 arg0) struct weaponfunc *secondaryfunc = weaponGetFunctionById(var800a21c0, 1); if (primaryfunc && secondaryfunc) { - return textGet(primaryfunc->name); + return langGet(primaryfunc->name); } - return textGet(0x5603); // "\n" + return langGet(0x5603); // "\n" } char *func0f1058d0(s32 arg0) @@ -3492,14 +3492,14 @@ char *func0f1058d0(s32 arg0) struct weaponfunc *secondaryfunc = weaponGetFunctionById(var800a21c0, 1); if (secondaryfunc) { - return textGet(secondaryfunc->name); + return langGet(secondaryfunc->name); } if (primaryfunc) { - return textGet(primaryfunc->name); + return langGet(primaryfunc->name); } - return textGet(0x5603); // "\n" + return langGet(0x5603); // "\n" } GLOBAL_ASM( @@ -3805,13 +3805,13 @@ char *func0f105d9c(s32 arg0) if (weapon) { if (weapon->manufacturer == 0x4c00) { // "\n" - return textGet(0x5603); // "\n" + return langGet(0x5603); // "\n" } - return textGet(weapon->name); + return langGet(weapon->name); } - return textGet(0x5603); // "\n" + return langGet(0x5603); // "\n" } /** @@ -3827,16 +3827,16 @@ char *func0f105e04(s32 arg0) } if (textid != 0x4c00) { - return textGet(textid); + return langGet(textid); } weapon = weaponFindById(var800a21c0); if (weapon) { - return textGet(weapon->name); + return langGet(weapon->name); } - return textGet(0x5603); // "\n" + return langGet(0x5603); // "\n" } GLOBAL_ASM( @@ -3863,7 +3863,7 @@ glabel func0f105e80 /* f105ecc: 24010001 */ addiu $at,$zero,0x1 /* f105ed0: 54810006 */ bnel $a0,$at,.L0f105eec /* f105ed4: 24010002 */ addiu $at,$zero,0x2 -/* f105ed8: 0fc5b9f1 */ jal textGet +/* f105ed8: 0fc5b9f1 */ jal langGet /* f105edc: 24044ced */ addiu $a0,$zero,0x4ced /* f105ee0: 1000004e */ beqz $zero,.L0f10601c /* f105ee4: 8fbf0014 */ lw $ra,0x14($sp) @@ -3871,7 +3871,7 @@ glabel func0f105e80 .L0f105eec: /* f105eec: 54810006 */ bnel $a0,$at,.L0f105f08 /* f105ef0: 24010050 */ addiu $at,$zero,0x50 -/* f105ef4: 0fc5b9f1 */ jal textGet +/* f105ef4: 0fc5b9f1 */ jal langGet /* f105ef8: 24044cec */ addiu $a0,$zero,0x4cec /* f105efc: 10000047 */ beqz $zero,.L0f10601c /* f105f00: 8fbf0014 */ lw $ra,0x14($sp) @@ -3930,7 +3930,7 @@ glabel func0f105e80 /* f105fc8: 2729fffc */ addiu $t1,$t9,-4 /* f105fcc: 1464fffa */ bne $v1,$a0,.L0f105fb8 /* f105fd0: a049ffff */ sb $t1,-0x1($v0) -/* f105fd4: 0fc5b9f1 */ jal textGet +/* f105fd4: 0fc5b9f1 */ jal langGet /* f105fd8: 24044cef */ addiu $a0,$zero,0x4cef /* f105fdc: 3c048007 */ lui $a0,0x8007 /* f105fe0: 8c841440 */ lw $a0,0x1440($a0) @@ -3942,12 +3942,12 @@ glabel func0f105e80 /* f105ff8: 10000007 */ beqz $zero,.L0f106018 /* f105ffc: 8c421440 */ lw $v0,0x1440($v0) .L0f106000: -/* f106000: 0fc5b9f1 */ jal textGet +/* f106000: 0fc5b9f1 */ jal langGet /* f106004: 94a4004a */ lhu $a0,0x4a($a1) /* f106008: 10000004 */ beqz $zero,.L0f10601c /* f10600c: 8fbf0014 */ lw $ra,0x14($sp) .L0f106010: -/* f106010: 0fc5b9f1 */ jal textGet +/* f106010: 0fc5b9f1 */ jal langGet /* f106014: 24045603 */ addiu $a0,$zero,0x5603 .L0f106018: /* f106018: 8fbf0014 */ lw $ra,0x14($sp) @@ -4318,7 +4318,7 @@ glabel func0f106508 /* f106544: 8f190000 */ lw $t9,0x0($t8) /* f106548: 10990005 */ beq $a0,$t9,.L0f106560 /* f10654c: 00000000 */ sll $zero,$zero,0x0 -/* f106550: 0fc5b9f1 */ jal textGet +/* f106550: 0fc5b9f1 */ jal langGet /* f106554: 240456ac */ addiu $a0,$zero,0x56ac /* f106558: 10000016 */ beqz $zero,.L0f1065b4 /* f10655c: 8fbf0014 */ lw $ra,0x14($sp) @@ -4329,10 +4329,10 @@ glabel func0f106508 /* f10656c: 01284823 */ subu $t1,$t1,$t0 /* f106570: 00094880 */ sll $t1,$t1,0x2 /* f106574: 00892021 */ addu $a0,$a0,$t1 -/* f106578: 0fc5b9f1 */ jal textGet +/* f106578: 0fc5b9f1 */ jal langGet /* f10657c: 94841e76 */ lhu $a0,0x1e76($a0) /* f106580: afa20018 */ sw $v0,0x18($sp) -/* f106584: 0fc5b9f1 */ jal textGet +/* f106584: 0fc5b9f1 */ jal langGet /* f106588: 240456ac */ addiu $a0,$zero,0x56ac /* f10658c: 3c048007 */ lui $a0,0x8007 /* f106590: 3c057f1b */ lui $a1,%hi(var7f1b2d54) @@ -4438,7 +4438,7 @@ glabel menuhandler00106644 /* f1066e0: 3c048007 */ lui $a0,0x8007 /* f1066e4: 1440000a */ bnez $v0,.L0f106710 /* f1066e8: 00026880 */ sll $t5,$v0,0x2 -/* f1066ec: 0fc5b9f1 */ jal textGet +/* f1066ec: 0fc5b9f1 */ jal langGet /* f1066f0: 240457c0 */ addiu $a0,$zero,0x57c0 /* f1066f4: 3c048007 */ lui $a0,0x8007 /* f1066f8: 8c841440 */ lw $a0,0x1440($a0) @@ -4451,7 +4451,7 @@ glabel menuhandler00106644 /* f106710: 01a26823 */ subu $t5,$t5,$v0 /* f106714: 000d6880 */ sll $t5,$t5,0x2 /* f106718: 008d2021 */ addu $a0,$a0,$t5 -/* f10671c: 0fc5b9f1 */ jal textGet +/* f10671c: 0fc5b9f1 */ jal langGet /* f106720: 948436d4 */ lhu $a0,0x36d4($a0) /* f106724: 10000032 */ beqz $zero,.L0f1067f0 /* f106728: 8fbf0014 */ lw $ra,0x14($sp) @@ -4494,7 +4494,7 @@ glabel menuhandler00106644 /* f1067b8: 8cca0000 */ lw $t2,0x0($a2) /* f1067bc: 000a58c0 */ sll $t3,$t2,0x3 /* f1067c0: 004b6021 */ addu $t4,$v0,$t3 -/* f1067c4: 0fc5b9f1 */ jal textGet +/* f1067c4: 0fc5b9f1 */ jal langGet /* f1067c8: 95840004 */ lhu $a0,0x4($t4) /* f1067cc: 10000008 */ beqz $zero,.L0f1067f0 /* f1067d0: 8fbf0014 */ lw $ra,0x14($sp) @@ -4622,7 +4622,7 @@ glabel func0f106a7c .L0f106ae4: /* f106ae4: 00187840 */ sll $t7,$t8,0x1 /* f106ae8: 006f7021 */ addu $t6,$v1,$t7 -/* f106aec: 0fc5b9f1 */ jal textGet +/* f106aec: 0fc5b9f1 */ jal langGet /* f106af0: 95c40000 */ lhu $a0,0x0($t6) /* f106af4: 10000007 */ beqz $zero,.L0f106b14 /* f106af8: 8fbf0014 */ lw $ra,0x14($sp) @@ -4630,7 +4630,7 @@ glabel func0f106a7c .L0f106b00: /* f106b00: 00195040 */ sll $t2,$t9,0x1 /* f106b04: 004a4821 */ addu $t1,$v0,$t2 -/* f106b08: 0fc5b9f1 */ jal textGet +/* f106b08: 0fc5b9f1 */ jal langGet /* f106b0c: 95240000 */ lhu $a0,0x0($t1) /* f106b10: 8fbf0014 */ lw $ra,0x14($sp) .L0f106b14: diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 2ce63f120..93a2d30a5 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -329,7 +329,7 @@ glabel func0f107fb0 /* f107fe4: 28810006 */ slti $at,$a0,0x6 /* f107fe8: 50200006 */ beqzl $at,.L0f108004 /* f107fec: 00001025 */ or $v0,$zero,$zero -/* f107ff0: 0fc5b9f1 */ jal textGet +/* f107ff0: 0fc5b9f1 */ jal langGet /* f107ff4: 95240000 */ lhu $a0,0x0($t1) /* f107ff8: 10000003 */ beqz $zero,.L0f108008 /* f107ffc: 8fbf0014 */ lw $ra,0x14($sp) @@ -633,7 +633,7 @@ glabel func0f108424 /* f108460: 0018c840 */ sll $t9,$t8,0x1 /* f108464: afbf0014 */ sw $ra,0x14($sp) /* f108468: 00992021 */ addu $a0,$a0,$t9 -/* f10846c: 0fc5b9f1 */ jal textGet +/* f10846c: 0fc5b9f1 */ jal langGet /* f108470: 9484438c */ lhu $a0,0x438c($a0) /* f108474: 8fbf0014 */ lw $ra,0x14($sp) /* f108478: 27bd0018 */ addiu $sp,$sp,0x18 @@ -833,7 +833,7 @@ glabel func0f1086b8 /* f108724: 00075840 */ sll $t3,$a3,0x1 /* f108728: 15410005 */ bne $t2,$at,.L0f108740 /* f10872c: 010b6021 */ addu $t4,$t0,$t3 -/* f108730: 0fc5b9f1 */ jal textGet +/* f108730: 0fc5b9f1 */ jal langGet /* f108734: 95840000 */ lhu $a0,0x0($t4) /* f108738: 10000009 */ beqz $zero,.L0f108760 /* f10873c: 8fbf0014 */ lw $ra,0x14($sp) @@ -905,32 +905,32 @@ glabel func0f10876c /* f10881c: 8c2c3584 */ lw $t4,%lo(var7f1b3584)($at) /* f108820: 01800008 */ jr $t4 /* f108824: 00000000 */ sll $zero,$zero,0x0 -/* f108828: 0fc5b9f1 */ jal textGet +/* f108828: 0fc5b9f1 */ jal langGet /* f10882c: 97a4001c */ lhu $a0,0x1c($sp) /* f108830: 10000018 */ beqz $zero,.L0f108894 /* f108834: 8fbf0014 */ lw $ra,0x14($sp) -/* f108838: 0fc5b9f1 */ jal textGet +/* f108838: 0fc5b9f1 */ jal langGet /* f10883c: 97a4001e */ lhu $a0,0x1e($sp) /* f108840: 10000014 */ beqz $zero,.L0f108894 /* f108844: 8fbf0014 */ lw $ra,0x14($sp) -/* f108848: 0fc5b9f1 */ jal textGet +/* f108848: 0fc5b9f1 */ jal langGet /* f10884c: 97a40020 */ lhu $a0,0x20($sp) /* f108850: 10000010 */ beqz $zero,.L0f108894 /* f108854: 8fbf0014 */ lw $ra,0x14($sp) -/* f108858: 0fc5b9f1 */ jal textGet +/* f108858: 0fc5b9f1 */ jal langGet /* f10885c: 97a40022 */ lhu $a0,0x22($sp) /* f108860: 1000000c */ beqz $zero,.L0f108894 /* f108864: 8fbf0014 */ lw $ra,0x14($sp) -/* f108868: 0fc5b9f1 */ jal textGet +/* f108868: 0fc5b9f1 */ jal langGet /* f10886c: 97a40028 */ lhu $a0,0x28($sp) /* f108870: 10000008 */ beqz $zero,.L0f108894 /* f108874: 8fbf0014 */ lw $ra,0x14($sp) -/* f108878: 0fc5b9f1 */ jal textGet +/* f108878: 0fc5b9f1 */ jal langGet /* f10887c: 97a4002a */ lhu $a0,0x2a($sp) /* f108880: 10000004 */ beqz $zero,.L0f108894 /* f108884: 8fbf0014 */ lw $ra,0x14($sp) .L0f108888: -/* f108888: 0fc5b9f1 */ jal textGet +/* f108888: 0fc5b9f1 */ jal langGet /* f10888c: 97a4002c */ lhu $a0,0x2c($sp) /* f108890: 8fbf0014 */ lw $ra,0x14($sp) .L0f108894: @@ -983,20 +983,20 @@ glabel func0f1088a0 /* f108938: 8c2c35c4 */ lw $t4,%lo(var7f1b35c4)($at) /* f10893c: 01800008 */ jr $t4 /* f108940: 00000000 */ sll $zero,$zero,0x0 -/* f108944: 0fc5b9f1 */ jal textGet +/* f108944: 0fc5b9f1 */ jal langGet /* f108948: 97a40020 */ lhu $a0,0x20($sp) /* f10894c: 1000000c */ beqz $zero,.L0f108980 /* f108950: 8fbf0014 */ lw $ra,0x14($sp) -/* f108954: 0fc5b9f1 */ jal textGet +/* f108954: 0fc5b9f1 */ jal langGet /* f108958: 97a40022 */ lhu $a0,0x22($sp) /* f10895c: 10000008 */ beqz $zero,.L0f108980 /* f108960: 8fbf0014 */ lw $ra,0x14($sp) -/* f108964: 0fc5b9f1 */ jal textGet +/* f108964: 0fc5b9f1 */ jal langGet /* f108968: 97a40024 */ lhu $a0,0x24($sp) /* f10896c: 10000004 */ beqz $zero,.L0f108980 /* f108970: 8fbf0014 */ lw $ra,0x14($sp) .L0f108974: -/* f108974: 0fc5b9f1 */ jal textGet +/* f108974: 0fc5b9f1 */ jal langGet /* f108978: 97a40020 */ lhu $a0,0x20($sp) /* f10897c: 8fbf0014 */ lw $ra,0x14($sp) .L0f108980: @@ -1389,7 +1389,7 @@ glabel func0f108f90 /* f108fdc: 1460fff9 */ bnez $v1,.L0f108fc4 /* f108fe0: 00000000 */ sll $zero,$zero,0x0 .L0f108fe4: -/* f108fe4: 0fc5b9f1 */ jal textGet +/* f108fe4: 0fc5b9f1 */ jal langGet /* f108fe8: 2404576b */ addiu $a0,$zero,0x576b /* f108fec: 27a40094 */ addiu $a0,$sp,0x94 /* f108ff0: 00402825 */ or $a1,$v0,$zero @@ -2696,12 +2696,12 @@ glabel func0f10a22c /* f10a2b8: 00b87821 */ addu $t7,$a1,$t8 /* f10a2bc: 05a10005 */ bgez $t5,.L0f10a2d4 /* f10a2c0: 00000000 */ sll $zero,$zero,0x0 -/* f10a2c4: 0fc5b9f1 */ jal textGet +/* f10a2c4: 0fc5b9f1 */ jal langGet /* f10a2c8: 97a4002e */ lhu $a0,0x2e($sp) /* f10a2cc: 10000004 */ beqz $zero,.L0f10a2e0 /* f10a2d0: 8fbf0014 */ lw $ra,0x14($sp) .L0f10a2d4: -/* f10a2d4: 0fc5b9f1 */ jal textGet +/* f10a2d4: 0fc5b9f1 */ jal langGet /* f10a2d8: 95e40000 */ lhu $a0,0x0($t7) .L0f10a2dc: /* f10a2dc: 8fbf0014 */ lw $ra,0x14($sp) @@ -2747,7 +2747,7 @@ glabel func0f10a2ec .L0f10a364: /* f10a364: 14c00005 */ bnez $a2,.L0f10a37c /* f10a368: 3c048007 */ lui $a0,0x8007 -/* f10a36c: 0fc5b9f1 */ jal textGet +/* f10a36c: 0fc5b9f1 */ jal langGet /* f10a370: 24045774 */ addiu $a0,$zero,0x5774 /* f10a374: 10000008 */ beqz $zero,.L0f10a398 /* f10a378: 8fbf0014 */ lw $ra,0x14($sp) @@ -2918,12 +2918,12 @@ glabel func0f10a5e8 /* f10a5fc: 24844a34 */ addiu $a0,$a0,%lo(menudialog_copyfile) /* f10a600: 10400005 */ beqz $v0,.L0f10a618 /* f10a604: 00000000 */ sll $zero,$zero,0x0 -/* f10a608: 0fc5b9f1 */ jal textGet +/* f10a608: 0fc5b9f1 */ jal langGet /* f10a60c: 240454f0 */ addiu $a0,$zero,0x54f0 /* f10a610: 10000004 */ beqz $zero,.L0f10a624 /* f10a614: 8fbf0014 */ lw $ra,0x14($sp) .L0f10a618: -/* f10a618: 0fc5b9f1 */ jal textGet +/* f10a618: 0fc5b9f1 */ jal langGet /* f10a61c: 240454a0 */ addiu $a0,$zero,0x54a0 /* f10a620: 8fbf0014 */ lw $ra,0x14($sp) .L0f10a624: @@ -3891,12 +3891,12 @@ glabel menucustomDeleteGameNote /* f10b418: 10000012 */ beqz $zero,.L0f10b464 /* f10b41c: 8e190000 */ lw $t9,0x0($s0) .L0f10b420: -/* f10b420: 0fc5b9f1 */ jal textGet +/* f10b420: 0fc5b9f1 */ jal langGet /* f10b424: 24045788 */ addiu $a0,$zero,0x5788 /* f10b428: 27a400d4 */ addiu $a0,$sp,0xd4 /* f10b42c: 0c004dad */ jal sprintf /* f10b430: 00402825 */ or $a1,$v0,$zero -/* f10b434: 0fc5b9f1 */ jal textGet +/* f10b434: 0fc5b9f1 */ jal langGet /* f10b438: 24045789 */ addiu $a0,$zero,0x5789 /* f10b43c: 27a4005c */ addiu $a0,$sp,0x5c /* f10b440: 0c004dad */ jal sprintf @@ -4119,7 +4119,7 @@ glabel func0f10b75c /* f10b768: afbf0014 */ sw $ra,0x14($sp) /* f10b76c: 15c00009 */ bnez $t6,.L0f10b794 /* f10b770: afa40018 */ sw $a0,0x18($sp) -/* f10b774: 0fc5b9f1 */ jal textGet +/* f10b774: 0fc5b9f1 */ jal langGet /* f10b778: 2404578a */ addiu $a0,$zero,0x578a /* f10b77c: 3c048007 */ lui $a0,0x8007 /* f10b780: 8c841440 */ lw $a0,0x1440($a0) @@ -4128,7 +4128,7 @@ glabel func0f10b75c /* f10b78c: 1000000b */ beqz $zero,.L0f10b7bc /* f10b790: 8fbf0014 */ lw $ra,0x14($sp) .L0f10b794: -/* f10b794: 0fc5b9f1 */ jal textGet +/* f10b794: 0fc5b9f1 */ jal langGet /* f10b798: 2404578b */ addiu $a0,$zero,0x578b /* f10b79c: 3c0f8007 */ lui $t7,0x8007 /* f10b7a0: 8def4a4c */ lw $t7,0x4a4c($t7) @@ -4153,7 +4153,7 @@ glabel func0f10b7cc /* f10b7d8: afbf0014 */ sw $ra,0x14($sp) /* f10b7dc: 15c00009 */ bnez $t6,.L0f10b804 /* f10b7e0: afa40018 */ sw $a0,0x18($sp) -/* f10b7e4: 0fc5b9f1 */ jal textGet +/* f10b7e4: 0fc5b9f1 */ jal langGet /* f10b7e8: 2404578c */ addiu $a0,$zero,0x578c /* f10b7ec: 3c048007 */ lui $a0,0x8007 /* f10b7f0: 8c841444 */ lw $a0,0x1444($a0) @@ -4162,7 +4162,7 @@ glabel func0f10b7cc /* f10b7fc: 1000000b */ beqz $zero,.L0f10b82c /* f10b800: 8fbf0014 */ lw $ra,0x14($sp) .L0f10b804: -/* f10b804: 0fc5b9f1 */ jal textGet +/* f10b804: 0fc5b9f1 */ jal langGet /* f10b808: 2404578d */ addiu $a0,$zero,0x578d /* f10b80c: 3c0f8007 */ lui $t7,0x8007 /* f10b810: 8def4a4c */ lw $t7,0x4a4c($t7) @@ -4189,7 +4189,7 @@ glabel func0f10b83c /* f10b850: 00005025 */ or $t2,$zero,$zero /* f10b854: 14a00005 */ bnez $a1,.L0f10b86c /* f10b858: 00005825 */ or $t3,$zero,$zero -/* f10b85c: 0fc5b9f1 */ jal textGet +/* f10b85c: 0fc5b9f1 */ jal langGet /* f10b860: 2404578e */ addiu $a0,$zero,0x578e /* f10b864: 1000002c */ beqz $zero,.L0f10b918 /* f10b868: 8fbf0014 */ lw $ra,0x14($sp) @@ -4223,7 +4223,7 @@ glabel func0f10b83c /* f10b8c8: 24840004 */ addiu $a0,$a0,0x4 /* f10b8cc: 51400006 */ beqzl $t2,.L0f10b8e8 /* f10b8d0: 94ac0242 */ lhu $t4,0x242($a1) -/* f10b8d4: 0fc5b9f1 */ jal textGet +/* f10b8d4: 0fc5b9f1 */ jal langGet /* f10b8d8: 2404578e */ addiu $a0,$zero,0x578e /* f10b8dc: 1000000e */ beqz $zero,.L0f10b918 /* f10b8e0: 8fbf0014 */ lw $ra,0x14($sp) @@ -4235,12 +4235,12 @@ glabel func0f10b83c /* f10b8f4: 15600005 */ bnez $t3,.L0f10b90c /* f10b8f8: 00000000 */ sll $zero,$zero,0x0 .L0f10b8fc: -/* f10b8fc: 0fc5b9f1 */ jal textGet +/* f10b8fc: 0fc5b9f1 */ jal langGet /* f10b900: 24045790 */ addiu $a0,$zero,0x5790 /* f10b904: 10000004 */ beqz $zero,.L0f10b918 /* f10b908: 8fbf0014 */ lw $ra,0x14($sp) .L0f10b90c: -/* f10b90c: 0fc5b9f1 */ jal textGet +/* f10b90c: 0fc5b9f1 */ jal langGet /* f10b910: 2404578f */ addiu $a0,$zero,0x578f /* f10b914: 8fbf0014 */ lw $ra,0x14($sp) .L0f10b918: @@ -4875,7 +4875,7 @@ glabel menucustomChooseAgent /* f10c348: 8faa0124 */ lw $t2,0x124($sp) /* f10c34c: 15cf001d */ bne $t6,$t7,.L0f10c3c4 /* f10c350: 00000000 */ sll $zero,$zero,0x0 -/* f10c354: 0fc5b9f1 */ jal textGet +/* f10c354: 0fc5b9f1 */ jal langGet /* f10c358: 24045793 */ addiu $a0,$zero,0x5793 /* f10c35c: 0c002f02 */ jal func0000bc08 /* f10c360: afa20058 */ sw $v0,0x58($sp) @@ -4946,7 +4946,7 @@ glabel menucustomChooseAgent /* f10c460: 000b5880 */ sll $t3,$t3,0x2 /* f10c464: 3c048007 */ lui $a0,0x8007 /* f10c468: 008b2021 */ addu $a0,$a0,$t3 -/* f10c46c: 0fc5b9f1 */ jal textGet +/* f10c46c: 0fc5b9f1 */ jal langGet /* f10c470: 94841e66 */ lhu $a0,0x1e66($a0) /* f10c474: 93b80117 */ lbu $t8,0x117($sp) /* f10c478: 3c048007 */ lui $a0,0x8007 @@ -4955,7 +4955,7 @@ glabel menucustomChooseAgent /* f10c484: 01b86823 */ subu $t5,$t5,$t8 /* f10c488: 000d6880 */ sll $t5,$t5,0x2 /* f10c48c: 008d2021 */ addu $a0,$a0,$t5 -/* f10c490: 0fc5b9f1 */ jal textGet +/* f10c490: 0fc5b9f1 */ jal langGet /* f10c494: 94841e68 */ lhu $a0,0x1e68($a0) /* f10c498: 3c057f1b */ lui $a1,%hi(var7f1b350c) /* f10c49c: 24a5350c */ addiu $a1,$a1,%lo(var7f1b350c) @@ -4966,7 +4966,7 @@ glabel menucustomChooseAgent /* f10c4b0: 10000006 */ beqz $zero,.L0f10c4cc /* f10c4b4: 00000000 */ sll $zero,$zero,0x0 .L0f10c4b8: -/* f10c4b8: 0fc5b9f1 */ jal textGet +/* f10c4b8: 0fc5b9f1 */ jal langGet /* f10c4bc: 24045794 */ addiu $a0,$zero,0x5794 /* f10c4c0: 27a4009c */ addiu $a0,$sp,0x9c /* f10c4c4: 0c004c4c */ jal strcpy @@ -5010,7 +5010,7 @@ glabel menucustomChooseAgent /* f10c558: afb90144 */ sw $t9,0x144($sp) /* f10c55c: 1980000f */ blez $t4,.L0f10c59c /* f10c560: afaf0140 */ sw $t7,0x140($sp) -/* f10c564: 0fc5b9f1 */ jal textGet +/* f10c564: 0fc5b9f1 */ jal langGet /* f10c568: 24045795 */ addiu $a0,$zero,0x5795 /* f10c56c: 8fab0108 */ lw $t3,0x108($sp) /* f10c570: 8fb80104 */ lw $t8,0x104($sp) @@ -5025,7 +5025,7 @@ glabel menucustomChooseAgent /* f10c594: 1000000b */ beqz $zero,.L0f10c5c4 /* f10c598: 00000000 */ sll $zero,$zero,0x0 .L0f10c59c: -/* f10c59c: 0fc5b9f1 */ jal textGet +/* f10c59c: 0fc5b9f1 */ jal langGet /* f10c5a0: 24045795 */ addiu $a0,$zero,0x5795 /* f10c5a4: 8fad0104 */ lw $t5,0x104($sp) /* f10c5a8: 3c057f1b */ lui $a1,%hi(var7f1b3528) @@ -5153,7 +5153,7 @@ glabel menucustomChooseAgent /* f10c784: 004e082b */ sltu $at,$v0,$t6 /* f10c788: 14200005 */ bnez $at,.L0f10c7a0 /* f10c78c: 00000000 */ sll $zero,$zero,0x0 -/* f10c790: 0fc5b9f1 */ jal textGet +/* f10c790: 0fc5b9f1 */ jal langGet /* f10c794: 24045792 */ addiu $a0,$zero,0x5792 /* f10c798: 10000016 */ beqz $zero,.L0f10c7f4 /* f10c79c: 8fbf003c */ lw $ra,0x3c($sp) @@ -5234,7 +5234,7 @@ glabel menudialog0010c804 /* f10c89c: 92380000 */ lbu $t8,0x0($s1) /* f10c8a0: 57000009 */ bnezl $t8,.L0f10c8c8 /* f10c8a4: 26100001 */ addiu $s0,$s0,0x1 -/* f10c8a8: 0fc5b9f1 */ jal textGet +/* f10c8a8: 0fc5b9f1 */ jal langGet /* f10c8ac: 240459b5 */ addiu $a0,$zero,0x59b5 /* f10c8b0: 02202025 */ or $a0,$s1,$zero /* f10c8b4: 02402825 */ or $a1,$s2,$zero diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 6d6cf950c..edee64761 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -206,12 +206,12 @@ glabel func0f10ce74 /* f10ceac: 8f190000 */ lw $t9,0x0($t8) /* f10ceb0: 10990005 */ beq $a0,$t9,.L0f10cec8 /* f10ceb4: 00000000 */ sll $zero,$zero,0x0 -/* f10ceb8: 0fc5b9f1 */ jal textGet +/* f10ceb8: 0fc5b9f1 */ jal langGet /* f10cebc: 2404572c */ addiu $a0,$zero,0x572c /* f10cec0: 10000017 */ beqz $zero,.L0f10cf20 /* f10cec4: 8fbf0014 */ lw $ra,0x14($sp) .L0f10cec8: -/* f10cec8: 0fc5b9f1 */ jal textGet +/* f10cec8: 0fc5b9f1 */ jal langGet /* f10cecc: 24045728 */ addiu $a0,$zero,0x5728 /* f10ced0: 3c08800a */ lui $t0,0x800a /* f10ced4: 9108dfea */ lbu $t0,-0x2016($t0) @@ -221,7 +221,7 @@ glabel func0f10ce74 /* f10cee4: 01284823 */ subu $t1,$t1,$t0 /* f10cee8: 00094880 */ sll $t1,$t1,0x2 /* f10ceec: 00892021 */ addu $a0,$a0,$t1 -/* f10cef0: 0fc5b9f1 */ jal textGet +/* f10cef0: 0fc5b9f1 */ jal langGet /* f10cef4: 94841e76 */ lhu $a0,0x1e76($a0) /* f10cef8: 3c048007 */ lui $a0,0x8007 /* f10cefc: 3c057f1b */ lui $a1,%hi(var7f1b3860) @@ -258,12 +258,12 @@ glabel func0f10cf2c /* f10cf64: 8f190000 */ lw $t9,0x0($t8) /* f10cf68: 10990005 */ beq $a0,$t9,.L0f10cf80 /* f10cf6c: 00000000 */ sll $zero,$zero,0x0 -/* f10cf70: 0fc5b9f1 */ jal textGet +/* f10cf70: 0fc5b9f1 */ jal langGet /* f10cf74: 2404572c */ addiu $a0,$zero,0x572c /* f10cf78: 10000017 */ beqz $zero,.L0f10cfd8 /* f10cf7c: 8fbf0014 */ lw $ra,0x14($sp) .L0f10cf80: -/* f10cf80: 0fc5b9f1 */ jal textGet +/* f10cf80: 0fc5b9f1 */ jal langGet /* f10cf84: 24045729 */ addiu $a0,$zero,0x5729 /* f10cf88: 3c08800a */ lui $t0,0x800a /* f10cf8c: 9108dfea */ lbu $t0,-0x2016($t0) @@ -273,7 +273,7 @@ glabel func0f10cf2c /* f10cf9c: 01284823 */ subu $t1,$t1,$t0 /* f10cfa0: 00094880 */ sll $t1,$t1,0x2 /* f10cfa4: 00892021 */ addu $a0,$a0,$t1 -/* f10cfa8: 0fc5b9f1 */ jal textGet +/* f10cfa8: 0fc5b9f1 */ jal langGet /* f10cfac: 94841e76 */ lhu $a0,0x1e76($a0) /* f10cfb0: 3c048007 */ lui $a0,0x8007 /* f10cfb4: 3c057f1b */ lui $a1,%hi(var7f1b3868) @@ -514,7 +514,7 @@ glabel func0f10d2e0 /* f10d308: 51e00006 */ beqzl $t7,.L0f10d324 /* f10d30c: 8c780298 */ lw $t8,0x298($v1) .L0f10d310: -/* f10d310: 0fc5b9f1 */ jal textGet +/* f10d310: 0fc5b9f1 */ jal langGet /* f10d314: 24045487 */ addiu $a0,$zero,0x5487 /* f10d318: 1000006b */ beqz $zero,.L0f10d4c8 /* f10d31c: 8fbf0014 */ lw $ra,0x14($sp) @@ -531,7 +531,7 @@ glabel func0f10d2e0 /* f10d344: 51000006 */ beqzl $t0,.L0f10d360 /* f10d348: 8c4900d8 */ lw $t1,0xd8($v0) .L0f10d34c: -/* f10d34c: 0fc5b9f1 */ jal textGet +/* f10d34c: 0fc5b9f1 */ jal langGet /* f10d350: 24045727 */ addiu $a0,$zero,0x5727 /* f10d354: 1000005c */ beqz $zero,.L0f10d4c8 /* f10d358: 8fbf0014 */ lw $ra,0x14($sp) @@ -542,7 +542,7 @@ glabel func0f10d2e0 /* f10d368: 8c8a00d8 */ lw $t2,0xd8($a0) /* f10d36c: 11400043 */ beqz $t2,.L0f10d47c /* f10d370: 00000000 */ sll $zero,$zero,0x0 -/* f10d374: 0fc5b9f1 */ jal textGet +/* f10d374: 0fc5b9f1 */ jal langGet /* f10d378: 24045725 */ addiu $a0,$zero,0x5725 /* f10d37c: 10000052 */ beqz $zero,.L0f10d4c8 /* f10d380: 8fbf0014 */ lw $ra,0x14($sp) @@ -557,7 +557,7 @@ glabel func0f10d2e0 /* f10d3a0: 8c4d048c */ lw $t5,0x48c($v0) /* f10d3a4: 51a00006 */ beqzl $t5,.L0f10d3c0 /* f10d3a8: 8c6e02a8 */ lw $t6,0x2a8($v1) -/* f10d3ac: 0fc5b9f1 */ jal textGet +/* f10d3ac: 0fc5b9f1 */ jal langGet /* f10d3b0: 24045727 */ addiu $a0,$zero,0x5727 /* f10d3b4: 10000044 */ beqz $zero,.L0f10d4c8 /* f10d3b8: 8fbf0014 */ lw $ra,0x14($sp) @@ -566,7 +566,7 @@ glabel func0f10d2e0 /* f10d3c0: 8dcf048c */ lw $t7,0x48c($t6) /* f10d3c4: 51e00006 */ beqzl $t7,.L0f10d3e0 /* f10d3c8: 8c5800d8 */ lw $t8,0xd8($v0) -/* f10d3cc: 0fc5b9f1 */ jal textGet +/* f10d3cc: 0fc5b9f1 */ jal langGet /* f10d3d0: 24045727 */ addiu $a0,$zero,0x5727 /* f10d3d4: 1000003c */ beqz $zero,.L0f10d4c8 /* f10d3d8: 8fbf0014 */ lw $ra,0x14($sp) @@ -574,7 +574,7 @@ glabel func0f10d2e0 .L0f10d3e0: /* f10d3e0: 13000026 */ beqz $t8,.L0f10d47c /* f10d3e4: 00000000 */ sll $zero,$zero,0x0 -/* f10d3e8: 0fc5b9f1 */ jal textGet +/* f10d3e8: 0fc5b9f1 */ jal langGet /* f10d3ec: 24045725 */ addiu $a0,$zero,0x5725 /* f10d3f0: 10000035 */ beqz $zero,.L0f10d4c8 /* f10d3f4: 8fbf0014 */ lw $ra,0x14($sp) @@ -583,7 +583,7 @@ glabel func0f10d2e0 /* f10d3fc: 8f28048c */ lw $t0,0x48c($t9) /* f10d400: 51000006 */ beqzl $t0,.L0f10d41c /* f10d404: 8c49048c */ lw $t1,0x48c($v0) -/* f10d408: 0fc5b9f1 */ jal textGet +/* f10d408: 0fc5b9f1 */ jal langGet /* f10d40c: 24045727 */ addiu $a0,$zero,0x5727 /* f10d410: 1000002d */ beqz $zero,.L0f10d4c8 /* f10d414: 8fbf0014 */ lw $ra,0x14($sp) @@ -594,7 +594,7 @@ glabel func0f10d2e0 /* f10d424: 8c4a00d8 */ lw $t2,0xd8($v0) /* f10d428: 15400014 */ bnez $t2,.L0f10d47c /* f10d42c: 00000000 */ sll $zero,$zero,0x0 -/* f10d430: 0fc5b9f1 */ jal textGet +/* f10d430: 0fc5b9f1 */ jal langGet /* f10d434: 24045725 */ addiu $a0,$zero,0x5725 /* f10d438: 10000023 */ beqz $zero,.L0f10d4c8 /* f10d43c: 8fbf0014 */ lw $ra,0x14($sp) @@ -603,7 +603,7 @@ glabel func0f10d2e0 /* f10d444: 8c4b048c */ lw $t3,0x48c($v0) /* f10d448: 51600006 */ beqzl $t3,.L0f10d464 /* f10d44c: 8c4c00d8 */ lw $t4,0xd8($v0) -/* f10d450: 0fc5b9f1 */ jal textGet +/* f10d450: 0fc5b9f1 */ jal langGet /* f10d454: 24045727 */ addiu $a0,$zero,0x5727 /* f10d458: 1000001b */ beqz $zero,.L0f10d4c8 /* f10d45c: 8fbf0014 */ lw $ra,0x14($sp) @@ -611,7 +611,7 @@ glabel func0f10d2e0 .L0f10d464: /* f10d464: 11800005 */ beqz $t4,.L0f10d47c /* f10d468: 00000000 */ sll $zero,$zero,0x0 -/* f10d46c: 0fc5b9f1 */ jal textGet +/* f10d46c: 0fc5b9f1 */ jal langGet /* f10d470: 24045725 */ addiu $a0,$zero,0x5725 /* f10d474: 10000014 */ beqz $zero,.L0f10d4c8 /* f10d478: 8fbf0014 */ lw $ra,0x14($sp) @@ -620,7 +620,7 @@ glabel func0f10d2e0 /* f10d480: 00000000 */ sll $zero,$zero,0x0 /* f10d484: 14400005 */ bnez $v0,.L0f10d49c /* f10d488: 3c0d8008 */ lui $t5,0x8008 -/* f10d48c: 0fc5b9f1 */ jal textGet +/* f10d48c: 0fc5b9f1 */ jal langGet /* f10d490: 24045725 */ addiu $a0,$zero,0x5725 /* f10d494: 1000000c */ beqz $zero,.L0f10d4c8 /* f10d498: 8fbf0014 */ lw $ra,0x14($sp) @@ -629,12 +629,12 @@ glabel func0f10d2e0 /* f10d4a0: 24010019 */ addiu $at,$zero,0x19 /* f10d4a4: 15a10005 */ bne $t5,$at,.L0f10d4bc /* f10d4a8: 00000000 */ sll $zero,$zero,0x0 -/* f10d4ac: 0fc5b9f1 */ jal textGet +/* f10d4ac: 0fc5b9f1 */ jal langGet /* f10d4b0: 2404543e */ addiu $a0,$zero,0x543e /* f10d4b4: 10000004 */ beqz $zero,.L0f10d4c8 /* f10d4b8: 8fbf0014 */ lw $ra,0x14($sp) .L0f10d4bc: -/* f10d4bc: 0fc5b9f1 */ jal textGet +/* f10d4bc: 0fc5b9f1 */ jal langGet /* f10d4c0: 24045726 */ addiu $a0,$zero,0x5726 /* f10d4c4: 8fbf0014 */ lw $ra,0x14($sp) .L0f10d4c8: @@ -657,7 +657,7 @@ glabel func0f10d4d4 /* f10d4f8: 11e00005 */ beqz $t7,.L0f10d510 /* f10d4fc: 00000000 */ sll $zero,$zero,0x0 .L0f10d500: -/* f10d500: 0fc5b9f1 */ jal textGet +/* f10d500: 0fc5b9f1 */ jal langGet /* f10d504: 24045486 */ addiu $a0,$zero,0x5486 /* f10d508: 1000001c */ beqz $zero,.L0f10d57c /* f10d50c: 8fbf0014 */ lw $ra,0x14($sp) @@ -666,7 +666,7 @@ glabel func0f10d4d4 /* f10d514: 8c58048c */ lw $t8,0x48c($v0) /* f10d518: 53000006 */ beqzl $t8,.L0f10d534 /* f10d51c: 8c5900d8 */ lw $t9,0xd8($v0) -/* f10d520: 0fc5b9f1 */ jal textGet +/* f10d520: 0fc5b9f1 */ jal langGet /* f10d524: 24045724 */ addiu $a0,$zero,0x5724 /* f10d528: 10000014 */ beqz $zero,.L0f10d57c /* f10d52c: 8fbf0014 */ lw $ra,0x14($sp) @@ -675,7 +675,7 @@ glabel func0f10d4d4 /* f10d534: 3c088008 */ lui $t0,0x8008 /* f10d538: 13200005 */ beqz $t9,.L0f10d550 /* f10d53c: 00000000 */ sll $zero,$zero,0x0 -/* f10d540: 0fc5b9f1 */ jal textGet +/* f10d540: 0fc5b9f1 */ jal langGet /* f10d544: 24045722 */ addiu $a0,$zero,0x5722 /* f10d548: 1000000c */ beqz $zero,.L0f10d57c /* f10d54c: 8fbf0014 */ lw $ra,0x14($sp) @@ -684,12 +684,12 @@ glabel func0f10d4d4 /* f10d554: 24010019 */ addiu $at,$zero,0x19 /* f10d558: 15010005 */ bne $t0,$at,.L0f10d570 /* f10d55c: 00000000 */ sll $zero,$zero,0x0 -/* f10d560: 0fc5b9f1 */ jal textGet +/* f10d560: 0fc5b9f1 */ jal langGet /* f10d564: 2404543f */ addiu $a0,$zero,0x543f /* f10d568: 10000004 */ beqz $zero,.L0f10d57c /* f10d56c: 8fbf0014 */ lw $ra,0x14($sp) .L0f10d570: -/* f10d570: 0fc5b9f1 */ jal textGet +/* f10d570: 0fc5b9f1 */ jal langGet /* f10d574: 24045723 */ addiu $a0,$zero,0x5723 /* f10d578: 8fbf0014 */ lw $ra,0x14($sp) .L0f10d57c: @@ -720,10 +720,10 @@ glabel func0f10d588 /* f10d5cc: 0019c880 */ sll $t9,$t9,0x2 /* f10d5d0: afbf0014 */ sw $ra,0x14($sp) /* f10d5d4: 00992021 */ addu $a0,$a0,$t9 -/* f10d5d8: 0fc5b9f1 */ jal textGet +/* f10d5d8: 0fc5b9f1 */ jal langGet /* f10d5dc: 94841e76 */ lhu $a0,0x1e76($a0) /* f10d5e0: afa20018 */ sw $v0,0x18($sp) -/* f10d5e4: 0fc5b9f1 */ jal textGet +/* f10d5e4: 0fc5b9f1 */ jal langGet /* f10d5e8: 24045714 */ addiu $a0,$zero,0x5714 /* f10d5ec: 3c048007 */ lui $a0,0x8007 /* f10d5f0: 3c057f1b */ lui $a1,%hi(var7f1b389c) @@ -751,7 +751,7 @@ glabel func0f10d61c /* f10d638: 3c048007 */ lui $a0,0x8007 /* f10d63c: afbf0014 */ sw $ra,0x14($sp) /* f10d640: 008f2021 */ addu $a0,$a0,$t7 -/* f10d644: 0fc5b9f1 */ jal textGet +/* f10d644: 0fc5b9f1 */ jal langGet /* f10d648: 94841e76 */ lhu $a0,0x1e76($a0) /* f10d64c: 3c048007 */ lui $a0,0x8007 /* f10d650: 3c057f1b */ lui $a1,%hi(var7f1b38a4) @@ -778,10 +778,10 @@ glabel func0f10d678 /* f10d694: 3c048007 */ lui $a0,0x8007 /* f10d698: afbf0014 */ sw $ra,0x14($sp) /* f10d69c: 008f2021 */ addu $a0,$a0,$t7 -/* f10d6a0: 0fc5b9f1 */ jal textGet +/* f10d6a0: 0fc5b9f1 */ jal langGet /* f10d6a4: 94841e76 */ lhu $a0,0x1e76($a0) /* f10d6a8: afa20018 */ sw $v0,0x18($sp) -/* f10d6ac: 0fc5b9f1 */ jal textGet +/* f10d6ac: 0fc5b9f1 */ jal langGet /* f10d6b0: 24045715 */ addiu $a0,$zero,0x5715 /* f10d6b4: 3c048007 */ lui $a0,0x8007 /* f10d6b8: 3c057f1b */ lui $a1,%hi(var7f1b38a8) diff --git a/src/game/game_111600.c b/src/game/game_111600.c index 5846969b5..3be8b6aed 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -1859,7 +1859,7 @@ glabel func0f112dfc /* f112e00: afbf0014 */ sw $ra,0x14($sp) /* f112e04: 0fc44b3e */ jal func0f112cf8 /* f112e08: 00000000 */ sll $zero,$zero,0x0 -/* f112e0c: 0fc5b9f1 */ jal textGet +/* f112e0c: 0fc5b9f1 */ jal langGet /* f112e10: 00402025 */ or $a0,$v0,$zero /* f112e14: 8fbf0014 */ lw $ra,0x14($sp) /* f112e18: 27bd0018 */ addiu $sp,$sp,0x18 @@ -1891,7 +1891,7 @@ glabel func0f112e24 /* f112e70: 8c4e0014 */ lw $t6,0x14($v0) /* f112e74: 11c00005 */ beqz $t6,.L0f112e8c /* f112e78: 00000000 */ sll $zero,$zero,0x0 -/* f112e7c: 0fc5b9f1 */ jal textGet +/* f112e7c: 0fc5b9f1 */ jal langGet /* f112e80: 8c640014 */ lw $a0,0x14($v1) /* f112e84: 10000029 */ beqz $zero,.L0f112f2c /* f112e88: 8fbf0014 */ lw $ra,0x14($sp) @@ -1910,7 +1910,7 @@ glabel func0f112e24 /* f112eb4: 8c4f0014 */ lw $t7,0x14($v0) /* f112eb8: 11e00019 */ beqz $t7,.L0f112f20 /* f112ebc: 00000000 */ sll $zero,$zero,0x0 -/* f112ec0: 0fc5b9f1 */ jal textGet +/* f112ec0: 0fc5b9f1 */ jal langGet /* f112ec4: 8c440014 */ lw $a0,0x14($v0) /* f112ec8: 10000018 */ beqz $zero,.L0f112f2c /* f112ecc: 8fbf0014 */ lw $ra,0x14($sp) @@ -2021,7 +2021,7 @@ glabel func0f112fec /* f113004: 8c4e001c */ lw $t6,0x1c($v0) /* f113008: 51c00006 */ beqzl $t6,.L0f113024 /* f11300c: 00001025 */ or $v0,$zero,$zero -/* f113010: 0fc5b9f1 */ jal textGet +/* f113010: 0fc5b9f1 */ jal langGet /* f113014: 8c44001c */ lw $a0,0x1c($v0) /* f113018: 10000003 */ beqz $zero,.L0f113028 /* f11301c: 8fbf0014 */ lw $ra,0x14($sp) @@ -2045,7 +2045,7 @@ glabel func0f113034 /* f11304c: 8c4e001c */ lw $t6,0x1c($v0) /* f113050: 51c00006 */ beqzl $t6,.L0f11306c /* f113054: 00001025 */ or $v0,$zero,$zero -/* f113058: 0fc5b9f1 */ jal textGet +/* f113058: 0fc5b9f1 */ jal langGet /* f11305c: 8c44001c */ lw $a0,0x1c($v0) /* f113060: 10000003 */ beqz $zero,.L0f113070 /* f113064: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 71758e953..ba5f0b165 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -19318,11 +19318,11 @@ glabel func0f13a3ec /* f13a4f0: 0059a021 */ addu $s4,$v0,$t9 /* f13a4f4: afb80080 */ sw $t8,0x80($sp) /* f13a4f8: afaf0084 */ sw $t7,0x84($sp) -/* f13a4fc: 0fc5b9f1 */ jal textGet +/* f13a4fc: 0fc5b9f1 */ jal langGet /* f13a500: afad008c */ sw $t5,0x8c($sp) /* f13a504: 8eca0000 */ lw $t2,0x0($s6) /* f13a508: ae820000 */ sw $v0,0x0($s4) -/* f13a50c: 0fc5b9f1 */ jal textGet +/* f13a50c: 0fc5b9f1 */ jal langGet /* f13a510: 95440004 */ lhu $a0,0x4($t2) /* f13a514: 8ec30000 */ lw $v1,0x0($s6) /* f13a518: ae820004 */ sw $v0,0x4($s4) @@ -30354,7 +30354,7 @@ glabel func0f143888 /* f144374: afb402b4 */ sw $s4,0x2b4($sp) /* f144378: afb802b0 */ sw $t8,0x2b0($sp) .L0f14437c: -/* f14437c: 0fc5b9f1 */ jal textGet +/* f14437c: 0fc5b9f1 */ jal langGet /* f144380: e7a00074 */ swc1 $f0,0x74($sp) /* f144384: 3c017f1b */ lui $at,%hi(var7f1b5f50) /* f144388: c4285f50 */ lwc1 $f8,%lo(var7f1b5f50)($at) @@ -30432,7 +30432,7 @@ glabel func0f143888 /* f1444a8: 0fc55b92 */ jal func0f156e48 /* f1444ac: afb8001c */ sw $t8,0x1c($sp) /* f1444b0: 0040a825 */ or $s5,$v0,$zero -/* f1444b4: 0fc5b9f1 */ jal textGet +/* f1444b4: 0fc5b9f1 */ jal langGet /* f1444b8: 2404584a */ addiu $a0,$zero,0x584a /* f1444bc: 8ed90284 */ lw $t9,0x284($s6) /* f1444c0: 3c017f1b */ lui $at,%hi(var7f1b5f54) @@ -30501,7 +30501,7 @@ glabel func0f143888 /* f1445bc: 0fc55b92 */ jal func0f156e48 /* f1445c0: afb8001c */ sw $t8,0x1c($sp) /* f1445c4: 0040a825 */ or $s5,$v0,$zero -/* f1445c8: 0fc5b9f1 */ jal textGet +/* f1445c8: 0fc5b9f1 */ jal langGet /* f1445cc: 2404584b */ addiu $a0,$zero,0x584b /* f1445d0: 8ed90284 */ lw $t9,0x284($s6) /* f1445d4: 3c057f1b */ lui $a1,%hi(var7f1b5e04) @@ -30566,7 +30566,7 @@ glabel func0f143888 /* f1446c0: 0fc55b92 */ jal func0f156e48 /* f1446c4: afb9001c */ sw $t9,0x1c($sp) /* f1446c8: 0040a825 */ or $s5,$v0,$zero -/* f1446cc: 0fc5b9f1 */ jal textGet +/* f1446cc: 0fc5b9f1 */ jal langGet /* f1446d0: 2404584c */ addiu $a0,$zero,0x584c /* f1446d4: 8ece0284 */ lw $t6,0x284($s6) /* f1446d8: 3c057f1b */ lui $a1,%hi(var7f1b5e0c) @@ -30631,7 +30631,7 @@ glabel func0f143888 /* f1447c4: 0fc55b92 */ jal func0f156e48 /* f1447c8: afae001c */ sw $t6,0x1c($sp) /* f1447cc: 0040a825 */ or $s5,$v0,$zero -/* f1447d0: 0fc5b9f1 */ jal textGet +/* f1447d0: 0fc5b9f1 */ jal langGet /* f1447d4: 2404584d */ addiu $a0,$zero,0x584d /* f1447d8: 3c057f1b */ lui $a1,%hi(var7f1b5e14) /* f1447dc: 24a55e14 */ addiu $a1,$a1,%lo(var7f1b5e14) @@ -30715,7 +30715,7 @@ glabel func0f143888 /* f144904: 91e3006b */ lbu $v1,0x6b($t7) /* f144908: 5460000b */ bnezl $v1,.L0f144938 /* f14490c: 24010001 */ addiu $at,$zero,0x1 -/* f144910: 0fc5b9f1 */ jal textGet +/* f144910: 0fc5b9f1 */ jal langGet /* f144914: 2404584e */ addiu $a0,$zero,0x584e /* f144918: 3c057f1b */ lui $a1,%hi(var7f1b5e18) /* f14491c: 24a55e18 */ addiu $a1,$a1,%lo(var7f1b5e18) @@ -30728,7 +30728,7 @@ glabel func0f143888 .L0f144938: /* f144938: 1461000a */ bne $v1,$at,.L0f144964 /* f14493c: 00000000 */ sll $zero,$zero,0x0 -/* f144940: 0fc5b9f1 */ jal textGet +/* f144940: 0fc5b9f1 */ jal langGet /* f144944: 240458d0 */ addiu $a0,$zero,0x58d0 /* f144948: 3c057f1b */ lui $a1,%hi(var7f1b5e1c) /* f14494c: 24a55e1c */ addiu $a1,$a1,%lo(var7f1b5e1c) @@ -30738,7 +30738,7 @@ glabel func0f143888 /* f14495c: 10000008 */ beqz $zero,.L0f144980 /* f144960: 00000000 */ sll $zero,$zero,0x0 .L0f144964: -/* f144964: 0fc5b9f1 */ jal textGet +/* f144964: 0fc5b9f1 */ jal langGet /* f144968: 240458d9 */ addiu $a0,$zero,0x58d9 /* f14496c: 3c057f1b */ lui $a1,%hi(var7f1b5e20) /* f144970: 24a55e20 */ addiu $a1,$a1,%lo(var7f1b5e20) @@ -30823,7 +30823,7 @@ glabel func0f143888 /* f144a98: 9303006b */ lbu $v1,0x6b($t8) /* f144a9c: 5460004f */ bnezl $v1,.L0f144bdc /* f144aa0: 24010001 */ addiu $at,$zero,0x1 -/* f144aa4: 0fc5b9f1 */ jal textGet +/* f144aa4: 0fc5b9f1 */ jal langGet /* f144aa8: 2404584f */ addiu $a0,$zero,0x584f /* f144aac: 3c057f1b */ lui $a1,%hi(var7f1b5e24) /* f144ab0: 24a55e24 */ addiu $a1,$a1,%lo(var7f1b5e24) @@ -30906,7 +30906,7 @@ glabel func0f143888 .L0f144bdc: /* f144bdc: 1461004e */ bne $v1,$at,.L0f144d18 /* f144be0: 00000000 */ sll $zero,$zero,0x0 -/* f144be4: 0fc5b9f1 */ jal textGet +/* f144be4: 0fc5b9f1 */ jal langGet /* f144be8: 240459d4 */ addiu $a0,$zero,0x59d4 /* f144bec: 3c057f1b */ lui $a1,%hi(var7f1b5e2c) /* f144bf0: 24a55e2c */ addiu $a1,$a1,%lo(var7f1b5e2c) @@ -30986,7 +30986,7 @@ glabel func0f143888 /* f144d10: 1000004b */ beqz $zero,.L0f144e40 /* f144d14: 0040a825 */ or $s5,$v0,$zero .L0f144d18: -/* f144d18: 0fc5b9f1 */ jal textGet +/* f144d18: 0fc5b9f1 */ jal langGet /* f144d1c: 240459d5 */ addiu $a0,$zero,0x59d5 /* f144d20: 3c057f1b */ lui $a1,%hi(var7f1b5e34) /* f144d24: 24a55e34 */ addiu $a1,$a1,%lo(var7f1b5e34) @@ -31068,7 +31068,7 @@ glabel func0f143888 /* f144e48: 91e3006b */ lbu $v1,0x6b($t7) /* f144e4c: 5460000b */ bnezl $v1,.L0f144e7c /* f144e50: 24010001 */ addiu $at,$zero,0x1 -/* f144e54: 0fc5b9f1 */ jal textGet +/* f144e54: 0fc5b9f1 */ jal langGet /* f144e58: 24045850 */ addiu $a0,$zero,0x5850 /* f144e5c: 3c057f1b */ lui $a1,%hi(var7f1b5e3c) /* f144e60: 24a55e3c */ addiu $a1,$a1,%lo(var7f1b5e3c) @@ -31081,7 +31081,7 @@ glabel func0f143888 .L0f144e7c: /* f144e7c: 1461000a */ bne $v1,$at,.L0f144ea8 /* f144e80: 00000000 */ sll $zero,$zero,0x0 -/* f144e84: 0fc5b9f1 */ jal textGet +/* f144e84: 0fc5b9f1 */ jal langGet /* f144e88: 240458cf */ addiu $a0,$zero,0x58cf /* f144e8c: 3c057f1b */ lui $a1,%hi(var7f1b5e40) /* f144e90: 24a55e40 */ addiu $a1,$a1,%lo(var7f1b5e40) @@ -31091,7 +31091,7 @@ glabel func0f143888 /* f144ea0: 10000008 */ beqz $zero,.L0f144ec4 /* f144ea4: 00000000 */ sll $zero,$zero,0x0 .L0f144ea8: -/* f144ea8: 0fc5b9f1 */ jal textGet +/* f144ea8: 0fc5b9f1 */ jal langGet /* f144eac: 240458d8 */ addiu $a0,$zero,0x58d8 /* f144eb0: 3c057f1b */ lui $a1,%hi(var7f1b5e44) /* f144eb4: 24a55e44 */ addiu $a1,$a1,%lo(var7f1b5e44) @@ -31184,7 +31184,7 @@ glabel func0f143888 /* f144ffc: 1461000a */ bne $v1,$at,.L0f145028 /* f145000: 00000000 */ sll $zero,$zero,0x0 .L0f145004: -/* f145004: 0fc5b9f1 */ jal textGet +/* f145004: 0fc5b9f1 */ jal langGet /* f145008: 24045851 */ addiu $a0,$zero,0x5851 /* f14500c: 3c057f1b */ lui $a1,%hi(var7f1b5e48) /* f145010: 24a55e48 */ addiu $a1,$a1,%lo(var7f1b5e48) @@ -31194,7 +31194,7 @@ glabel func0f143888 /* f145020: 10000008 */ beqz $zero,.L0f145044 /* f145024: 00000000 */ sll $zero,$zero,0x0 .L0f145028: -/* f145028: 0fc5b9f1 */ jal textGet +/* f145028: 0fc5b9f1 */ jal langGet /* f14502c: 240458ce */ addiu $a0,$zero,0x58ce /* f145030: 3c057f1b */ lui $a1,%hi(var7f1b5e4c) /* f145034: 24a55e4c */ addiu $a1,$a1,%lo(var7f1b5e4c) @@ -36826,7 +36826,7 @@ GLOBAL_ASM( glabel func0f14a1cc /* f14a1cc: 27bdffe8 */ addiu $sp,$sp,-24 /* f14a1d0: afbf0014 */ sw $ra,0x14($sp) -/* f14a1d4: 0fc5b9f1 */ jal textGet +/* f14a1d4: 0fc5b9f1 */ jal langGet /* f14a1d8: 248459ad */ addiu $a0,$a0,0x59ad /* f14a1dc: 8fbf0014 */ lw $ra,0x14($sp) /* f14a1e0: 27bd0018 */ addiu $sp,$sp,0x18 @@ -36838,7 +36838,7 @@ GLOBAL_ASM( glabel func0f14a1ec /* f14a1ec: 27bdffe8 */ addiu $sp,$sp,-24 /* f14a1f0: afbf0014 */ sw $ra,0x14($sp) -/* f14a1f4: 0fc5b9f1 */ jal textGet +/* f14a1f4: 0fc5b9f1 */ jal langGet /* f14a1f8: 248459b1 */ addiu $a0,$a0,0x59b1 /* f14a1fc: 8fbf0014 */ lw $ra,0x14($sp) /* f14a200: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 50ccfebaf..1de6ee719 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -6698,7 +6698,7 @@ glabel func0f16b96c .L0f16c4a8: /* f16c4a8: 0fc4a24b */ jal setCurrentPlayerNum /* f16c4ac: 02002025 */ or $a0,$s0,$zero -/* f16c4b0: 0fc5b9f1 */ jal textGet +/* f16c4b0: 0fc5b9f1 */ jal langGet /* f16c4b4: 24045844 */ addiu $a0,$zero,0x5844 /* f16c4b8: 00402025 */ or $a0,$v0,$zero /* f16c4bc: 0fc377c7 */ jal currentPlayerQueueMessage @@ -7204,8 +7204,8 @@ void stageLoad(void) } if (g_Vars.stagenum < NUM_STAGES) { - s32 bank = textGetLangBankIndexFromStagenum(g_Vars.stagenum); - textClearBank(bank); + s32 bank = langGetLangBankIndexFromStagenum(g_Vars.stagenum); + langClearBank(bank); func0f015270(); } diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 3f5877617..54e3867f0 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1416,346 +1416,3 @@ glabel func0f16e138 /* f16e1d8: 00000000 */ sll $zero,$zero,0x0 /* f16e1dc: 00000000 */ sll $zero,$zero,0x0 ); - -u32 textGetLangBankIndexFromStagenum(s32 stagenum) -{ - u32 index; - - switch (stagenum) { - case STAGE_PELAGIC: index = 0x0b; break; - case STAGE_EXTRACTION: index = 0x03; break; - case STAGE_TEST_RUN: index = 0x1c; break; - case STAGE_24: index = 0x1f; break; - case STAGE_MAIANSOS: index = 0x1e; break; - case STAGE_TEST_DEST: index = 0x0d; break; - case STAGE_2B: index = 0x20; break; - case STAGE_RETAKING: index = 0x1d; break; - case STAGE_WAR: index = 0x23; break; - case STAGE_CHICAGO: index = 0x19; break; - case STAGE_G5BUILDING: index = 0x0c; break; - case STAGE_ESCAPE: index = 0x24; break; - case STAGE_MP_TEMPLE: index = 0x12; break; - case STAGE_MP_PIPES: index = 0x09; break; - case STAGE_MP_G5BUILDING: index = 0x0a; break; - case STAGE_CITRAINING: index = 0x0e; break; - case STAGE_MP_COMPLEX: index = 0x1a; break; - case STAGE_MP_SKEDAR: index = 0x17; break; - case STAGE_TEST_LEN: index = 0x14; break; - case STAGE_DEFECTION: index = 0x01; break; - case STAGE_VILLA: index = 0x10; break; - case STAGE_DEFENSE: index = 0x11; break; - case STAGE_TEST_ASH: index = 0x04; break; - case STAGE_INVESTIGATION: index = 0x0f; break; - case STAGE_ATTACKSHIP: index = 0x13; break; - case STAGE_RESCUE: index = 0x15; break; - case STAGE_INFILTRATION: index = 0x16; break; - case STAGE_28: index = 0x0b; break; - case STAGE_DEEPSEA: index = 0x18; break; - case STAGE_SKEDARRUINS: index = 0x21; break; - case STAGE_AIRFORCEONE: index = 0x1b; break; - case STAGE_TEST_ARCH: index = 0x02; break; - case STAGE_MP_RAVINE: index = 0x08; break; - case STAGE_CRASHSITE: index = 0x05; break; - case STAGE_AIRBASE: index = 0x07; break; - case STAGE_TEST_UFF: index = 0x2d; break; - case STAGE_TEST_OLD: index = 0x2e; break; - case STAGE_DUEL: index = 0x2f; break; - case STAGE_TEST_LAM: index = 0x30; break; - case STAGE_MP_BASE: index = 0x31; break; - case STAGE_TEST_MP2: index = 0x32; break; - case STAGE_MP_AREA52: index = 0x33; break; - case STAGE_MP_WAREHOUSE: index = 0x34; break; - case STAGE_MP_CARPARK: index = 0x35; break; - case STAGE_TEST_MP6: index = 0x36; break; - case STAGE_TEST_MP7: index = 0x37; break; - case STAGE_TEST_MP8: index = 0x38; break; - case STAGE_MP_RUINS: index = 0x39; break; - case STAGE_MP_SEWERS: index = 0x3a; break; - case STAGE_MP_FELICITY: index = 0x3b; break; - case STAGE_MP_FORTRESS: index = 0x3c; break; - case STAGE_MP_VILLA: index = 0x3d; break; - case STAGE_TEST_MP14: index = 0x3e; break; - case STAGE_MP_GRID: index = 0x3f; break; - case STAGE_TEST_MP16: index = 0x40; break; - case STAGE_TEST_MP17: index = 0x41; break; - case STAGE_TEST_MP18: index = 0x42; break; - case STAGE_TEST_MP19: index = 0x43; break; - case STAGE_TEST_MP20: index = 0x44; break; - case STAGE_MBR: index = 0x25; break; - case STAGE_TEST_SILO: index = 0x22; break; - default: - while (true) { - // empty - } - } - - return index; -} - -GLOBAL_ASM( -glabel func0f16e3fc -/* f16e3fc: 27bdffc8 */ addiu $sp,$sp,-56 -/* f16e400: afb00018 */ sw $s0,0x18($sp) -/* f16e404: 308e2000 */ andi $t6,$a0,0x2000 -/* f16e408: 00808025 */ or $s0,$a0,$zero -/* f16e40c: afbf001c */ sw $ra,0x1c($sp) -/* f16e410: 240affff */ addiu $t2,$zero,-1 -/* f16e414: 240bffff */ addiu $t3,$zero,-1 -/* f16e418: 11c00002 */ beqz $t6,.L0f16e424 -/* f16e41c: 00004025 */ or $t0,$zero,$zero -/* f16e420: 24080001 */ addiu $t0,$zero,0x1 -.L0f16e424: -/* f16e424: 3c0c800b */ lui $t4,0x800b -/* f16e428: 8d8cabb8 */ lw $t4,-0x5448($t4) -/* f16e42c: 00002825 */ or $a1,$zero,$zero -/* f16e430: 00003825 */ or $a3,$zero,$zero -/* f16e434: 2409007c */ addiu $t1,$zero,0x7c -/* f16e438: 01802025 */ or $a0,$t4,$zero -.L0f16e43c: -/* f16e43c: 15000006 */ bnez $t0,.L0f16e458 -/* f16e440: 00000000 */ sll $zero,$zero,0x0 -/* f16e444: 94980000 */ lhu $t8,0x0($a0) -/* f16e448: 00107843 */ sra $t7,$s0,0x1 -/* f16e44c: 33193fff */ andi $t9,$t8,0x3fff -/* f16e450: 51f9001f */ beql $t7,$t9,.L0f16e4d0 -/* f16e454: 28a1007c */ slti $at,$a1,0x7c -.L0f16e458: -/* f16e458: 1100000b */ beqz $t0,.L0f16e488 -/* f16e45c: 94830000 */ lhu $v1,0x0($a0) -/* f16e460: 24ae0001 */ addiu $t6,$a1,0x1 -/* f16e464: 29c1007c */ slti $at,$t6,0x7c -/* f16e468: 10200007 */ beqz $at,.L0f16e488 -/* f16e46c: 00101043 */ sra $v0,$s0,0x1 -/* f16e470: 30783fff */ andi $t8,$v1,0x3fff -/* f16e474: 54580005 */ bnel $v0,$t8,.L0f16e48c -/* f16e478: 00031382 */ srl $v0,$v1,0xe -/* f16e47c: 948f0002 */ lhu $t7,0x2($a0) -/* f16e480: 31f93fff */ andi $t9,$t7,0x3fff -/* f16e484: 10590011 */ beq $v0,$t9,.L0f16e4cc -.L0f16e488: -/* f16e488: 00031382 */ srl $v0,$v1,0xe -.L0f16e48c: -/* f16e48c: 14400002 */ bnez $v0,.L0f16e498 -/* f16e490: 24a60001 */ addiu $a2,$a1,0x1 -/* f16e494: 00a05025 */ or $t2,$a1,$zero -.L0f16e498: -/* f16e498: 14400009 */ bnez $v0,.L0f16e4c0 -/* f16e49c: 24e70002 */ addiu $a3,$a3,0x2 -/* f16e4a0: 948e0002 */ lhu $t6,0x2($a0) -/* f16e4a4: 28c1007c */ slti $at,$a2,0x7c -/* f16e4a8: 000ec382 */ srl $t8,$t6,0xe -/* f16e4ac: 57000005 */ bnezl $t8,.L0f16e4c4 -/* f16e4b0: 00c02825 */ or $a1,$a2,$zero -/* f16e4b4: 50200003 */ beqzl $at,.L0f16e4c4 -/* f16e4b8: 00c02825 */ or $a1,$a2,$zero -/* f16e4bc: 00a05825 */ or $t3,$a1,$zero -.L0f16e4c0: -/* f16e4c0: 00c02825 */ or $a1,$a2,$zero -.L0f16e4c4: -/* f16e4c4: 14c9ffdd */ bne $a2,$t1,.L0f16e43c -/* f16e4c8: 24840002 */ addiu $a0,$a0,0x2 -.L0f16e4cc: -/* f16e4cc: 28a1007c */ slti $at,$a1,0x7c -.L0f16e4d0: -/* f16e4d0: 10200021 */ beqz $at,.L0f16e558 -/* f16e4d4: 00000000 */ sll $zero,$zero,0x0 -/* f16e4d8: 1500000c */ bnez $t0,.L0f16e50c -/* f16e4dc: 240d0060 */ addiu $t5,$zero,0x60 -/* f16e4e0: 00ad0019 */ multu $a1,$t5 -/* f16e4e4: 908f0000 */ lbu $t7,0x0($a0) -/* f16e4e8: 31f9ff3f */ andi $t9,$t7,0xff3f -/* f16e4ec: 372e0080 */ ori $t6,$t9,0x80 -/* f16e4f0: a08e0000 */ sb $t6,0x0($a0) -/* f16e4f4: 3c0f800b */ lui $t7,0x800b -/* f16e4f8: 8defabb4 */ lw $t7,-0x544c($t7) -/* f16e4fc: 0000c012 */ mflo $t8 -/* f16e500: 030f1021 */ addu $v0,$t8,$t7 -/* f16e504: 1000006f */ beqz $zero,.L0f16e6c4 -/* f16e508: 8fbf001c */ lw $ra,0x1c($sp) -.L0f16e50c: -/* f16e50c: 90990000 */ lbu $t9,0x0($a0) -/* f16e510: 3c09800b */ lui $t1,%hi(var800aabb8) -/* f16e514: 2529abb8 */ addiu $t1,$t1,%lo(var800aabb8) -/* f16e518: 332eff3f */ andi $t6,$t9,0xff3f -/* f16e51c: 35d80080 */ ori $t8,$t6,0x80 -/* f16e520: a0980000 */ sb $t8,0x0($a0) -/* f16e524: 8d2f0000 */ lw $t7,0x0($t1) -/* f16e528: 240d0060 */ addiu $t5,$zero,0x60 -/* f16e52c: 00ad0019 */ multu $a1,$t5 -/* f16e530: 01e72021 */ addu $a0,$t7,$a3 -/* f16e534: 90990002 */ lbu $t9,0x2($a0) -/* f16e538: 332eff3f */ andi $t6,$t9,0xff3f -/* f16e53c: 35d80080 */ ori $t8,$t6,0x80 -/* f16e540: a0980002 */ sb $t8,0x2($a0) -/* f16e544: 3c19800b */ lui $t9,0x800b -/* f16e548: 8f39abb4 */ lw $t9,-0x544c($t9) -/* f16e54c: 00007812 */ mflo $t7 -/* f16e550: 1000005b */ beqz $zero,.L0f16e6c0 -/* f16e554: 01f91021 */ addu $v0,$t7,$t9 -.L0f16e558: -/* f16e558: 15000025 */ bnez $t0,.L0f16e5f0 -/* f16e55c: 00000000 */ sll $zero,$zero,0x0 -/* f16e560: 05400023 */ bltz $t2,.L0f16e5f0 -/* f16e564: 240d0060 */ addiu $t5,$zero,0x60 -/* f16e568: 014d0019 */ multu $t2,$t5 -/* f16e56c: 000a3840 */ sll $a3,$t2,0x1 -/* f16e570: 01871821 */ addu $v1,$t4,$a3 -/* f16e574: 906e0000 */ lbu $t6,0x0($v1) -/* f16e578: 3c09800b */ lui $t1,%hi(var800aabb8) -/* f16e57c: 2529abb8 */ addiu $t1,$t1,%lo(var800aabb8) -/* f16e580: 31d8ff3f */ andi $t8,$t6,0xff3f -/* f16e584: 370f0080 */ ori $t7,$t8,0x80 -/* f16e588: a06f0000 */ sb $t7,0x0($v1) -/* f16e58c: 8d390000 */ lw $t9,0x0($t1) -/* f16e590: 00004012 */ mflo $t0 -/* f16e594: 00101043 */ sra $v0,$s0,0x1 -/* f16e598: 03271821 */ addu $v1,$t9,$a3 -/* f16e59c: 004d0019 */ multu $v0,$t5 -/* f16e5a0: 946f0000 */ lhu $t7,0x0($v1) -/* f16e5a4: 30583fff */ andi $t8,$v0,0x3fff -/* f16e5a8: 24060060 */ addiu $a2,$zero,0x60 -/* f16e5ac: 31f9c000 */ andi $t9,$t7,0xc000 -/* f16e5b0: 03197025 */ or $t6,$t8,$t9 -/* f16e5b4: a46e0000 */ sh $t6,0x0($v1) -/* f16e5b8: 3c0f800b */ lui $t7,0x800b -/* f16e5bc: 8defabb4 */ lw $t7,-0x544c($t7) -/* f16e5c0: 3c190019 */ lui $t9,0x19 -/* f16e5c4: 27394440 */ addiu $t9,$t9,0x4440 -/* f16e5c8: 0000c012 */ mflo $t8 -/* f16e5cc: 03192821 */ addu $a1,$t8,$t9 -/* f16e5d0: afa80024 */ sw $t0,0x24($sp) -/* f16e5d4: 0c003504 */ jal func0000d410 -/* f16e5d8: 010f2021 */ addu $a0,$t0,$t7 -/* f16e5dc: 3c0e800b */ lui $t6,0x800b -/* f16e5e0: 8fa80024 */ lw $t0,0x24($sp) -/* f16e5e4: 8dceabb4 */ lw $t6,-0x544c($t6) -/* f16e5e8: 10000035 */ beqz $zero,.L0f16e6c0 -/* f16e5ec: 010e1021 */ addu $v0,$t0,$t6 -.L0f16e5f0: -/* f16e5f0: 11000032 */ beqz $t0,.L0f16e6bc -/* f16e5f4: 3c02800b */ lui $v0,0x800b -/* f16e5f8: 05600030 */ bltz $t3,.L0f16e6bc -/* f16e5fc: 000b1840 */ sll $v1,$t3,0x1 -/* f16e600: 01831021 */ addu $v0,$t4,$v1 -/* f16e604: 904f0000 */ lbu $t7,0x0($v0) -/* f16e608: 3c09800b */ lui $t1,%hi(var800aabb8) -/* f16e60c: 2529abb8 */ addiu $t1,$t1,%lo(var800aabb8) -/* f16e610: 31f8ff3f */ andi $t8,$t7,0xff3f -/* f16e614: 37190080 */ ori $t9,$t8,0x80 -/* f16e618: a0590000 */ sb $t9,0x0($v0) -/* f16e61c: 8d2e0000 */ lw $t6,0x0($t1) -/* f16e620: 240d0060 */ addiu $t5,$zero,0x60 -/* f16e624: 016d0019 */ multu $t3,$t5 -/* f16e628: 01c31021 */ addu $v0,$t6,$v1 -/* f16e62c: 904f0002 */ lbu $t7,0x2($v0) -/* f16e630: 24060080 */ addiu $a2,$zero,0x80 -/* f16e634: 31f8ff3f */ andi $t8,$t7,0xff3f -/* f16e638: 37190080 */ ori $t9,$t8,0x80 -/* f16e63c: a0590002 */ sb $t9,0x2($v0) -/* f16e640: 8d2e0000 */ lw $t6,0x0($t1) -/* f16e644: 00107843 */ sra $t7,$s0,0x1 -/* f16e648: 31e73fff */ andi $a3,$t7,0x3fff -/* f16e64c: 01c31021 */ addu $v0,$t6,$v1 -/* f16e650: 94590000 */ lhu $t9,0x0($v0) -/* f16e654: 00004012 */ mflo $t0 -/* f16e658: 332ec000 */ andi $t6,$t9,0xc000 -/* f16e65c: 00ee7825 */ or $t7,$a3,$t6 -/* f16e660: a44f0000 */ sh $t7,0x0($v0) -/* f16e664: 8d380000 */ lw $t8,0x0($t1) -/* f16e668: 03031021 */ addu $v0,$t8,$v1 -/* f16e66c: 94590002 */ lhu $t9,0x2($v0) -/* f16e670: 3c18800b */ lui $t8,0x800b -/* f16e674: 332ec000 */ andi $t6,$t9,0xc000 -/* f16e678: 00ee7825 */ or $t7,$a3,$t6 -/* f16e67c: a44f0002 */ sh $t7,0x2($v0) -/* f16e680: 8f18abb4 */ lw $t8,-0x544c($t8) -/* f16e684: 32191fff */ andi $t9,$s0,0x1fff -/* f16e688: 00197043 */ sra $t6,$t9,0x1 -/* f16e68c: 01182021 */ addu $a0,$t0,$t8 -/* f16e690: 3c18001a */ lui $t8,0x1a -/* f16e694: 2718fb40 */ addiu $t8,$t8,-1216 -/* f16e698: 000e79c0 */ sll $t7,$t6,0x7 -/* f16e69c: 01f82821 */ addu $a1,$t7,$t8 -/* f16e6a0: 0c003504 */ jal func0000d410 -/* f16e6a4: afa80024 */ sw $t0,0x24($sp) -/* f16e6a8: 3c19800b */ lui $t9,0x800b -/* f16e6ac: 8fa80024 */ lw $t0,0x24($sp) -/* f16e6b0: 8f39abb4 */ lw $t9,-0x544c($t9) -/* f16e6b4: 10000002 */ beqz $zero,.L0f16e6c0 -/* f16e6b8: 01191021 */ addu $v0,$t0,$t9 -.L0f16e6bc: -/* f16e6bc: 8c42abb4 */ lw $v0,-0x544c($v0) -.L0f16e6c0: -/* f16e6c0: 8fbf001c */ lw $ra,0x1c($sp) -.L0f16e6c4: -/* f16e6c4: 8fb00018 */ lw $s0,0x18($sp) -/* f16e6c8: 27bd0038 */ addiu $sp,$sp,0x38 -/* f16e6cc: 03e00008 */ jr $ra -/* f16e6d0: 00000000 */ sll $zero,$zero,0x0 -); - -/** - * NTSC only supports English, while PAL supports 4 languages and JAP has its - * own. Each English file is followed immediately by the other translations. - * - * As it stands in the NTSC version, g_LanguageId is a flag that controls - * whether it uses English or Japanese text. This decomp is NTSC, so that's what - * you see here. - * - * For PAL, I suspect this function was adjusted to return values other than - * 0 and 1. - */ -s32 textGetLanguageId(void) -{ - bool ret = 0; - - if (g_LanguageId != 0) { - ret = 1; - } - - return ret; -} - -s32 textGetFileId(s32 bank) -{ - return g_LangBanks[bank] + textGetLanguageId(); -} - -void textSetBankSimple(s32 bank) -{ - s32 file_id = textGetFileId(bank); - g_TextBanks[bank] = func0f1670fc(file_id, 0x22); -} - -void textSetBank(s32 bank, s32 arg1, s32 arg2) -{ - s32 file_id = textGetFileId(bank); - g_TextBanks[bank] = func0f167200(file_id, 0x22, arg1, arg2); -} - -void textClearBank(s32 bank) -{ - g_TextBanks[bank] = NULL; -} - -GLOBAL_ASM( -glabel textGet -/* f16e7c4: 00047243 */ sra $t6,$a0,0x9 -/* f16e7c8: 000e7880 */ sll $t7,$t6,0x2 -/* f16e7cc: 3c02800b */ lui $v0,0x800b -/* f16e7d0: 004f1021 */ addu $v0,$v0,$t7 -/* f16e7d4: 8c42aaa0 */ lw $v0,-0x5560($v0) -/* f16e7d8: 309801ff */ andi $t8,$a0,0x1ff -/* f16e7dc: 0018c880 */ sll $t9,$t8,0x2 -/* f16e7e0: 10400006 */ beqz $v0,.L0f16e7fc -/* f16e7e4: 00594021 */ addu $t0,$v0,$t9 -/* f16e7e8: 8d050000 */ lw $a1,0x0($t0) -/* f16e7ec: 10a00003 */ beqz $a1,.L0f16e7fc -/* f16e7f0: 00a21821 */ addu $v1,$a1,$v0 -/* f16e7f4: 03e00008 */ jr $ra -/* f16e7f8: 00601025 */ or $v0,$v1,$zero -.L0f16e7fc: -/* f16e7fc: 00001825 */ or $v1,$zero,$zero -/* f16e800: 03e00008 */ jr $ra -/* f16e804: 00601025 */ or $v0,$v1,$zero -); diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 4fafb03ba..60b9c7943 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -1834,7 +1834,7 @@ glabel func0f178050 /* f178084: 10000021 */ beqz $zero,.L0f17810c /* f178088: 8fbf0014 */ lw $ra,0x14($sp) .L0f17808c: -/* f17808c: 0fc5b9f1 */ jal textGet +/* f17808c: 0fc5b9f1 */ jal langGet /* f178090: 24045072 */ addiu $a0,$zero,0x5072 /* f178094: 3c06800b */ lui $a2,0x800b /* f178098: 90c6cb9a */ lbu $a2,-0x3466($a2) @@ -1846,7 +1846,7 @@ glabel func0f178050 /* f1780b0: 10000016 */ beqz $zero,.L0f17810c /* f1780b4: 8fbf0014 */ lw $ra,0x14($sp) .L0f1780b8: -/* f1780b8: 0fc5b9f1 */ jal textGet +/* f1780b8: 0fc5b9f1 */ jal langGet /* f1780bc: 24045071 */ addiu $a0,$zero,0x5071 /* f1780c0: 3c06800b */ lui $a2,0x800b /* f1780c4: 90c6cb9b */ lbu $a2,-0x3465($a2) @@ -1858,7 +1858,7 @@ glabel func0f178050 /* f1780dc: 1000000b */ beqz $zero,.L0f17810c /* f1780e0: 8fbf0014 */ lw $ra,0x14($sp) .L0f1780e4: -/* f1780e4: 0fc5b9f1 */ jal textGet +/* f1780e4: 0fc5b9f1 */ jal langGet /* f1780e8: 24045071 */ addiu $a0,$zero,0x5071 /* f1780ec: 0fc62113 */ jal func0f18844c /* f1780f0: afa20018 */ sw $v0,0x18($sp) @@ -1921,12 +1921,12 @@ glabel func0f1782b8 /* f1782c4: afa40018 */ sw $a0,0x18($sp) /* f1782c8: 10400005 */ beqz $v0,.L0f1782e0 /* f1782cc: 00000000 */ sll $zero,$zero,0x0 -/* f1782d0: 0fc5b9f1 */ jal textGet +/* f1782d0: 0fc5b9f1 */ jal langGet /* f1782d4: 24045121 */ addiu $a0,$zero,0x5121 /* f1782d8: 10000004 */ beqz $zero,.L0f1782ec /* f1782dc: 8fbf0014 */ lw $ra,0x14($sp) .L0f1782e0: -/* f1782e0: 0fc5b9f1 */ jal textGet +/* f1782e0: 0fc5b9f1 */ jal langGet /* f1782e4: 24045120 */ addiu $a0,$zero,0x5120 /* f1782e8: 8fbf0014 */ lw $ra,0x14($sp) .L0f1782ec: @@ -1973,7 +1973,7 @@ glabel func0f178330 /* f17836c: 8c84ee28 */ lw $a0,-0x11d8($a0) /* f178370: 10400005 */ beqz $v0,.L0f178388 /* f178374: 00000000 */ sll $zero,$zero,0x0 -/* f178378: 0fc5b9f1 */ jal textGet +/* f178378: 0fc5b9f1 */ jal langGet /* f17837c: 9444004a */ lhu $a0,0x4a($v0) /* f178380: 10000004 */ beqz $zero,.L0f178394 /* f178384: 8fbf0014 */ lw $ra,0x14($sp) @@ -2019,7 +2019,7 @@ glabel func0f1783a0 /* f178408: 01093021 */ addu $a2,$t0,$t1 .L0f17840c: /* f17840c: 24045118 */ addiu $a0,$zero,0x5118 -/* f178410: 0fc5b9f1 */ jal textGet +/* f178410: 0fc5b9f1 */ jal langGet /* f178414: afa6001c */ sw $a2,0x1c($sp) /* f178418: 3c048007 */ lui $a0,0x8007 /* f17841c: 8c841440 */ lw $a0,0x1440($a0) @@ -2138,7 +2138,7 @@ glabel func0f17853c /* f1785a0: 814ac7d6 */ lb $t2,-0x382a($t2) /* f1785a4: 000a5840 */ sll $t3,$t2,0x1 /* f1785a8: 004b6021 */ addu $t4,$v0,$t3 -/* f1785ac: 0fc5b9f1 */ jal textGet +/* f1785ac: 0fc5b9f1 */ jal langGet /* f1785b0: 95840000 */ lhu $a0,0x0($t4) /* f1785b4: 8fbf0014 */ lw $ra,0x14($sp) /* f1785b8: 27bd0030 */ addiu $sp,$sp,0x30 @@ -2572,7 +2572,7 @@ glabel func0f178bb0 /* f178bd0: 008f2021 */ addu $a0,$a0,$t7 /* f178bd4: 9084c84d */ lbu $a0,-0x37b3($a0) /* f178bd8: afbf0014 */ sw $ra,0x14($sp) -/* f178bdc: 0fc5b9f1 */ jal textGet +/* f178bdc: 0fc5b9f1 */ jal langGet /* f178be0: 248458b9 */ addiu $a0,$a0,0x58b9 /* f178be4: 8fbf0014 */ lw $ra,0x14($sp) /* f178be8: 27bd0018 */ addiu $sp,$sp,0x18 @@ -3061,7 +3061,7 @@ glabel menuhandler001791c8 /* f179294: 8e4b0000 */ lw $t3,0x0($s2) /* f179298: 562b0006 */ bnel $s1,$t3,.L0f1792b4 /* f17929c: 26310001 */ addiu $s1,$s1,0x1 -/* f1792a0: 0fc5b9f1 */ jal textGet +/* f1792a0: 0fc5b9f1 */ jal langGet /* f1792a4: 96040004 */ lhu $a0,0x4($s0) /* f1792a8: 1000007d */ beqz $zero,.L0f1794a0 /* f1792ac: 8fbf0024 */ lw $ra,0x24($sp) @@ -3152,7 +3152,7 @@ glabel menuhandler001791c8 /* f1793e4: 001160c0 */ sll $t4,$s1,0x3 .L0f1793e8: /* f1793e8: 03ac2021 */ addu $a0,$sp,$t4 -/* f1793ec: 0fc5b9f1 */ jal textGet +/* f1793ec: 0fc5b9f1 */ jal langGet /* f1793f0: 94840044 */ lhu $a0,0x44($a0) /* f1793f4: 1000002a */ beqz $zero,.L0f1794a0 /* f1793f8: 8fbf0024 */ lw $ra,0x24($sp) @@ -3221,7 +3221,7 @@ char *menuhandlerMpControlStyle(u32 operation, struct menu_item *item, s32 *valu *value = 4; break; case MENUOP_GETOPTIONTEXT: - return textGet(labels[*value]); + return langGet(labels[*value]); case MENUOP_SET: optionsSetControlMode(g_MpPlayerNum, *value); break; @@ -3330,7 +3330,7 @@ char *menuhandlerMpAimControl(u32 operation, struct menu_item *item, s32 *value) *value = 2; break; case MENUOP_GETOPTIONTEXT: - return textGet(labels[*value]); + return langGet(labels[*value]); case MENUOP_SET: optionsSetAimControl(g_MpPlayerNum, *value); break; @@ -5092,7 +5092,7 @@ glabel func0f17b360 /* f17b360: 27bdffe8 */ addiu $sp,$sp,-24 /* f17b364: afbf0014 */ sw $ra,0x14($sp) /* f17b368: afa40018 */ sw $a0,0x18($sp) -/* f17b36c: 0fc5b9f1 */ jal textGet +/* f17b36c: 0fc5b9f1 */ jal langGet /* f17b370: 24045091 */ addiu $a0,$zero,0x5091 /* f17b374: 3c0e8007 */ lui $t6,0x8007 /* f17b378: 8dce1448 */ lw $t6,0x1448($t6) @@ -5718,7 +5718,7 @@ glabel menuhandler0017bab4 /* f17bce0: 3c0e8007 */ lui $t6,0x8007 /* f17bce4: 14600005 */ bnez $v1,.L0f17bcfc /* f17bce8: 00000000 */ sll $zero,$zero,0x0 -/* f17bcec: 0fc5b9f1 */ jal textGet +/* f17bcec: 0fc5b9f1 */ jal langGet /* f17bcf0: 2404508d */ addiu $a0,$zero,0x508d /* f17bcf4: 1000004a */ beqz $zero,.L0f17be20 /* f17bcf8: 8fbf0014 */ lw $ra,0x14($sp) @@ -5869,7 +5869,7 @@ glabel func0f17be2c /* f17bf0c: 28410009 */ slti $at,$v0,0x9 /* f17bf10: 10200020 */ beqz $at,.L0f17bf94 /* f17bf14: 2404508c */ addiu $a0,$zero,0x508c -/* f17bf18: 0fc5b9f1 */ jal textGet +/* f17bf18: 0fc5b9f1 */ jal langGet /* f17bf1c: afa80038 */ sw $t0,0x38($sp) /* f17bf20: 97ac003e */ lhu $t4,0x3e($sp) /* f17bf24: 3c048008 */ lui $a0,0x8008 @@ -5878,7 +5878,7 @@ glabel func0f17be2c /* f17bf30: 01ac6823 */ subu $t5,$t5,$t4 /* f17bf34: 000d6840 */ sll $t5,$t5,0x1 /* f17bf38: 008d2021 */ addu $a0,$a0,$t5 -/* f17bf3c: 0fc5b9f1 */ jal textGet +/* f17bf3c: 0fc5b9f1 */ jal langGet /* f17bf40: 94847148 */ lhu $a0,0x7148($a0) /* f17bf44: 8fa80038 */ lw $t0,0x38($sp) /* f17bf48: 3c048008 */ lui $a0,0x8008 @@ -5887,7 +5887,7 @@ glabel func0f17be2c /* f17bf54: 01c87023 */ subu $t6,$t6,$t0 /* f17bf58: 000e7040 */ sll $t6,$t6,0x1 /* f17bf5c: 008e2021 */ addu $a0,$a0,$t6 -/* f17bf60: 0fc5b9f1 */ jal textGet +/* f17bf60: 0fc5b9f1 */ jal langGet /* f17bf64: 94844b9c */ lhu $a0,0x4b9c($a0) /* f17bf68: 97af0042 */ lhu $t7,0x42($sp) /* f17bf6c: 3c048007 */ lui $a0,0x8007 @@ -6061,9 +6061,9 @@ s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menu_item *item, struct n break; case MENUOP_GETSLIDERLABEL: if (value->num == 60) { - sprintf(value->text, textGet(0x5070)); // "No Limit" + sprintf(value->text, langGet(0x5070)); // "No Limit" } else { - sprintf(value->text, textGet(0x5072), value->num + 1); // "%d Min" + sprintf(value->text, langGet(0x5072), value->num + 1); // "%d Min" } } return 0; @@ -6080,9 +6080,9 @@ s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menu_item *item, struct break; case MENUOP_GETSLIDERLABEL: if (value->num == 100) { - sprintf(value->text, textGet(0x5070)); // "No Limit" + sprintf(value->text, langGet(0x5070)); // "No Limit" } else { - sprintf(value->text, textGet(0x5071), value->num + 1); // "%d" + sprintf(value->text, langGet(0x5071), value->num + 1); // "%d" } } @@ -6100,9 +6100,9 @@ s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menu_item *item, str break; case MENUOP_GETSLIDERLABEL: if (value->num == 400) { - sprintf(value->text, textGet(0x5070)); // "No Limit" + sprintf(value->text, langGet(0x5070)); // "No Limit" } else { - sprintf(value->text, textGet(0x5071), value->num + 1); // "%d" + sprintf(value->text, langGet(0x5071), value->num + 1); // "%d" } } @@ -6310,7 +6310,7 @@ glabel menuhandler0017c6a4 /* f17c770: 8e890000 */ lw $t1,0x0($s4) /* f17c774: 56490006 */ bnel $s2,$t1,.L0f17c790 /* f17c778: 26520001 */ addiu $s2,$s2,0x1 -/* f17c77c: 0fc5b9f1 */ jal textGet +/* f17c77c: 0fc5b9f1 */ jal langGet /* f17c780: 86040002 */ lh $a0,0x2($s0) /* f17c784: 100000a7 */ beqz $zero,.L0f17ca24 /* f17c788: 8fbf002c */ lw $ra,0x2c($sp) @@ -6462,7 +6462,7 @@ glabel menuhandler0017c6a4 /* f17c9a0: 8e890000 */ lw $t1,0x0($s4) /* f17c9a4: 000940c0 */ sll $t0,$t1,0x3 /* f17c9a8: 02685021 */ addu $t2,$s3,$t0 -/* f17c9ac: 0fc5b9f1 */ jal textGet +/* f17c9ac: 0fc5b9f1 */ jal langGet /* f17c9b0: 95440004 */ lhu $a0,0x4($t2) /* f17c9b4: 1000001b */ beqz $zero,.L0f17ca24 /* f17c9b8: 8fbf002c */ lw $ra,0x2c($sp) @@ -6523,7 +6523,7 @@ glabel func0f17ca40 /* f17ca70: 008f2021 */ addu $a0,$a0,$t7 /* f17ca74: 8c84ee24 */ lw $a0,-0x11dc($a0) /* f17ca78: afbf0014 */ sw $ra,0x14($sp) -/* f17ca7c: 0fc5b9f1 */ jal textGet +/* f17ca7c: 0fc5b9f1 */ jal langGet /* f17ca80: 2484586a */ addiu $a0,$a0,0x586a /* f17ca84: 8fbf0014 */ lw $ra,0x14($sp) /* f17ca88: 27bd0018 */ addiu $sp,$sp,0x18 @@ -6716,7 +6716,7 @@ glabel menuhandlerMpSimulantDifficulty /* f17cefc: 8e8a0000 */ lw $t2,0x0($s4) /* f17cf00: 564a0006 */ bnel $s2,$t2,.L0f17cf1c /* f17cf04: 26520001 */ addiu $s2,$s2,0x1 -/* f17cf08: 0fc5b9f1 */ jal textGet +/* f17cf08: 0fc5b9f1 */ jal langGet /* f17cf0c: 26245852 */ addiu $a0,$s1,0x5852 /* f17cf10: 1000000a */ beqz $zero,.L0f17cf3c /* f17cf14: 8fbf002c */ lw $ra,0x2c($sp) @@ -7358,12 +7358,12 @@ glabel func0f17dc44 /* f17dc50: afa40018 */ sw $a0,0x18($sp) /* f17dc54: 10400005 */ beqz $v0,.L0f17dc6c /* f17dc58: 00000000 */ sll $zero,$zero,0x0 -/* f17dc5c: 0fc5b9f1 */ jal textGet +/* f17dc5c: 0fc5b9f1 */ jal langGet /* f17dc60: 24045045 */ addiu $a0,$zero,0x5045 /* f17dc64: 10000004 */ beqz $zero,.L0f17dc78 /* f17dc68: 8fbf0014 */ lw $ra,0x14($sp) .L0f17dc6c: -/* f17dc6c: 0fc5b9f1 */ jal textGet +/* f17dc6c: 0fc5b9f1 */ jal langGet /* f17dc70: 24045044 */ addiu $a0,$zero,0x5044 /* f17dc74: 8fbf0014 */ lw $ra,0x14($sp) .L0f17dc78: @@ -7428,7 +7428,7 @@ glabel menuhandler0017dc84 /* f17dd48: 014c6821 */ addu $t5,$t2,$t4 /* f17dd4c: 3c048008 */ lui $a0,0x8008 /* f17dd50: 008d2021 */ addu $a0,$a0,$t5 -/* f17dd54: 0fc5b9f1 */ jal textGet +/* f17dd54: 0fc5b9f1 */ jal langGet /* f17dd58: 8c845cec */ lw $a0,0x5cec($a0) /* f17dd5c: 10000082 */ beqz $zero,.L0f17df68 /* f17dd60: 8fbf0014 */ lw $ra,0x14($sp) @@ -7440,7 +7440,7 @@ glabel menuhandler0017dc84 /* f17dd74: 01f94021 */ addu $t0,$t7,$t9 /* f17dd78: 3c048008 */ lui $a0,0x8008 /* f17dd7c: 00882021 */ addu $a0,$a0,$t0 -/* f17dd80: 0fc5b9f1 */ jal textGet +/* f17dd80: 0fc5b9f1 */ jal langGet /* f17dd84: 8c845ce8 */ lw $a0,0x5ce8($a0) /* f17dd88: 10000077 */ beqz $zero,.L0f17df68 /* f17dd8c: 8fbf0014 */ lw $ra,0x14($sp) @@ -7599,7 +7599,7 @@ glabel func0f17dfac /* f17dfb8: afa40018 */ sw $a0,0x18($sp) /* f17dfbc: 10400005 */ beqz $v0,.L0f17dfd4 /* f17dfc0: 00000000 */ sll $zero,$zero,0x0 -/* f17dfc4: 0fc5b9f1 */ jal textGet +/* f17dfc4: 0fc5b9f1 */ jal langGet /* f17dfc8: 24045042 */ addiu $a0,$zero,0x5042 /* f17dfcc: 1000000c */ beqz $zero,.L0f17e000 /* f17dfd0: 8fbf0014 */ lw $ra,0x14($sp) @@ -7613,7 +7613,7 @@ glabel func0f17dfac /* f17dfec: 10000004 */ beqz $zero,.L0f17e000 /* f17dff0: 8fbf0014 */ lw $ra,0x14($sp) .L0f17dff4: -/* f17dff4: 0fc5b9f1 */ jal textGet +/* f17dff4: 0fc5b9f1 */ jal langGet /* f17dff8: 24045043 */ addiu $a0,$zero,0x5043 /* f17dffc: 8fbf0014 */ lw $ra,0x14($sp) .L0f17e000: @@ -7813,7 +7813,7 @@ glabel func0f17e318 /* f17e318: 27bdffe0 */ addiu $sp,$sp,-32 /* f17e31c: afbf0014 */ sw $ra,0x14($sp) /* f17e320: afa40020 */ sw $a0,0x20($sp) -/* f17e324: 0fc5b9f1 */ jal textGet +/* f17e324: 0fc5b9f1 */ jal langGet /* f17e328: 24045038 */ addiu $a0,$zero,0x5038 /* f17e32c: 3c0e8007 */ lui $t6,0x8007 /* f17e330: 8dce1448 */ lw $t6,0x1448($t6) @@ -8307,7 +8307,7 @@ glabel func0f17eac8 /* f17ead8: afbf0014 */ sw $ra,0x14($sp) /* f17eadc: 11c10005 */ beq $t6,$at,.L0f17eaf4 /* f17eae0: afa40018 */ sw $a0,0x18($sp) -/* f17eae4: 0fc5b9f1 */ jal textGet +/* f17eae4: 0fc5b9f1 */ jal langGet /* f17eae8: 24045032 */ addiu $a0,$zero,0x5032 /* f17eaec: 1000000e */ beqz $zero,.L0f17eb28 /* f17eaf0: 8fbf0014 */ lw $ra,0x14($sp) @@ -8438,10 +8438,10 @@ char *menuhandlerMpLock(u32 operation, struct menu_item *item, s32 *value) break; case MENUOP_GETOPTIONTEXT: if (mpGetLockType() == MPLOCKTYPE_CHALLENGE) { - return textGet(0x5031); // "Challenge" + return langGet(0x5031); // "Challenge" } if ((u32)*value <= 3) { - return textGet(labels[*value]); + return langGet(labels[*value]); } if (mpGetLockType() == MPLOCKTYPE_PLAYER) { return g_MpPlayers[mpGetLockPlayerNum()].base.name; @@ -8493,12 +8493,12 @@ glabel func0f17eed4 /* f17eefc: afa40018 */ sw $a0,0x18($sp) /* f17ef00: 17000005 */ bnez $t8,.L0f17ef18 /* f17ef04: 00000000 */ sll $zero,$zero,0x0 -/* f17ef08: 0fc5b9f1 */ jal textGet +/* f17ef08: 0fc5b9f1 */ jal langGet /* f17ef0c: 24045026 */ addiu $a0,$zero,0x5026 /* f17ef10: 10000004 */ beqz $zero,.L0f17ef24 /* f17ef14: 8fbf0014 */ lw $ra,0x14($sp) .L0f17ef18: -/* f17ef18: 0fc5b9f1 */ jal textGet +/* f17ef18: 0fc5b9f1 */ jal langGet /* f17ef1c: 24045027 */ addiu $a0,$zero,0x5027 /* f17ef20: 8fbf0014 */ lw $ra,0x14($sp) .L0f17ef24: @@ -8553,7 +8553,7 @@ glabel func0f17f024 .L0f17f04c: /* f17f04c: 546e0006 */ bnel $v1,$t6,.L0f17f068 /* f17f050: 24420006 */ addiu $v0,$v0,0x6 -/* f17f054: 0fc5b9f1 */ jal textGet +/* f17f054: 0fc5b9f1 */ jal langGet /* f17f058: 94440004 */ lhu $a0,0x4($v0) /* f17f05c: 10000007 */ beqz $zero,.L0f17f07c /* f17f060: 8fbf0014 */ lw $ra,0x14($sp) @@ -9100,7 +9100,7 @@ glabel menuhandler0017f74c /* f17f7ec: 8e8f0000 */ lw $t7,0x0($s4) /* f17f7f0: 564f0006 */ bnel $s2,$t7,.L0f17f80c /* f17f7f4: 26520001 */ addiu $s2,$s2,0x1 -/* f17f7f8: 0fc5b9f1 */ jal textGet +/* f17f7f8: 0fc5b9f1 */ jal langGet /* f17f7fc: 26245852 */ addiu $a0,$s1,0x5852 /* f17f800: 1000001c */ beqz $zero,.L0f17f874 /* f17f804: 8fbf002c */ lw $ra,0x2c($sp) @@ -9519,7 +9519,7 @@ glabel menuhandlerMpSlowMotion /* f17fec8: 8cca0000 */ lw $t2,0x0($a2) /* f17fecc: 000a5840 */ sll $t3,$t2,0x1 /* f17fed0: 004b6021 */ addu $t4,$v0,$t3 -/* f17fed4: 0fc5b9f1 */ jal textGet +/* f17fed4: 0fc5b9f1 */ jal langGet /* f17fed8: 95840000 */ lhu $a0,0x0($t4) /* f17fedc: 10000025 */ beqz $zero,.L0f17ff74 /* f17fee0: 8fbf0014 */ lw $ra,0x14($sp) @@ -9912,7 +9912,7 @@ void scenarioHtbCallback14(struct chrdata *chr) if (g_Vars.unk000288->unk60 >= SECSTOFRAMES240(30)) { func00010904(var80095200, 0x5b8, 0, -1, -1, -1, -1, -1); var800ac500[g_Vars.currentplayernum]->unk3e++; - func0f0ddfa4(textGet(0x5418), 9, 1); + func0f0ddfa4(langGet(0x5418), 9, 1); g_Vars.unk000288->unk60 = 0; } } else { @@ -10872,7 +10872,7 @@ s32 menuhandlerMpHillTime(u32 operation, struct menu_item *item, struct numandte g_Vars.mphilltime = (u8)value->num; break; case MENUOP_GETSLIDERLABEL: - sprintf(value->text, textGet(0x5417), value->num + 10); // "%ds/Point" + sprintf(value->text, langGet(0x5417), value->num + 10); // "%ds/Point" break; } @@ -11234,7 +11234,7 @@ glabel scenarioKohCallback10 /* f182100: e7a40014 */ swc1 $f4,0x14($sp) /* f182104: a6700004 */ sh $s0,0x4($s3) /* f182108: a6600006 */ sh $zero,0x6($s3) -/* f18210c: 0fc5b9f1 */ jal textGet +/* f18210c: 0fc5b9f1 */ jal langGet /* f182110: 24045416 */ addiu $a0,$zero,0x5416 /* f182114: 00107080 */ sll $t6,$s0,0x2 /* f182118: 01d07023 */ subu $t6,$t6,$s0 @@ -11291,7 +11291,7 @@ glabel scenarioKohCallback10 /* f1821d0: 24050009 */ addiu $a1,$zero,0x9 /* f1821d4: 144f0009 */ bne $v0,$t7,.L0f1821fc /* f1821d8: 00000000 */ sll $zero,$zero,0x0 -/* f1821dc: 0fc5b9f1 */ jal textGet +/* f1821dc: 0fc5b9f1 */ jal langGet /* f1821e0: 24045415 */ addiu $a0,$zero,0x5415 /* f1821e4: 00402025 */ or $a0,$v0,$zero /* f1821e8: 24050009 */ addiu $a1,$zero,0x9 @@ -11427,7 +11427,7 @@ glabel scenarioKohCallback10 /* f1823c0: 00000000 */ sll $zero,$zero,0x0 /* f1823c4: 0fc4a24b */ jal setCurrentPlayerNum /* f1823c8: 02402025 */ or $a0,$s2,$zero -/* f1823cc: 0fc5b9f1 */ jal textGet +/* f1823cc: 0fc5b9f1 */ jal langGet /* f1823d0: 24045414 */ addiu $a0,$zero,0x5414 /* f1823d4: 00402025 */ or $a0,$v0,$zero /* f1823d8: 24050009 */ addiu $a1,$zero,0x9 @@ -12428,7 +12428,7 @@ glabel scenarioHtmCallback14 /* f1834ac: a432c1e2 */ sh $s2,-0x3e1e($at) /* f1834b0: 1680003b */ bnez $s4,.L0f1835a0 /* f1834b4: ade00108 */ sw $zero,0x108($t7) -/* f1834b8: 0fc5b9f1 */ jal textGet +/* f1834b8: 0fc5b9f1 */ jal langGet /* f1834bc: 24045412 */ addiu $a0,$zero,0x5412 /* f1834c0: 00402025 */ or $a0,$v0,$zero /* f1834c4: 24050009 */ addiu $a1,$zero,0x9 @@ -12465,7 +12465,7 @@ glabel scenarioHtmCallback14 .L0f183540: /* f183540: 56800018 */ bnezl $s4,.L0f1835a4 /* f183544: 26100001 */ addiu $s0,$s0,0x1 -/* f183548: 0fc5b9f1 */ jal textGet +/* f183548: 0fc5b9f1 */ jal langGet /* f18354c: 24045413 */ addiu $a0,$zero,0x5413 /* f183550: 00402025 */ or $a0,$v0,$zero /* f183554: 24050009 */ addiu $a1,$zero,0x9 @@ -12656,7 +12656,7 @@ glabel scenarioHtmCallback14 .L0f183808: /* f183808: 16800021 */ bnez $s4,.L0f183890 /* f18380c: 00000000 */ sll $zero,$zero,0x0 -/* f183810: 0fc5b9f1 */ jal textGet +/* f183810: 0fc5b9f1 */ jal langGet /* f183814: 24045411 */ addiu $a0,$zero,0x5411 /* f183818: 00402025 */ or $a0,$v0,$zero /* f18381c: 24050009 */ addiu $a1,$zero,0x9 @@ -12711,7 +12711,7 @@ glabel scenarioHtmCallback14 /* f1838d8: ae6b00d8 */ sw $t3,0xd8($s3) /* f1838dc: 16800022 */ bnez $s4,.L0f183968 /* f1838e0: a432c1e2 */ sh $s2,-0x3e1e($at) -/* f1838e4: 0fc5b9f1 */ jal textGet +/* f1838e4: 0fc5b9f1 */ jal langGet /* f1838e8: 24045410 */ addiu $a0,$zero,0x5410 /* f1838ec: 00402025 */ or $a0,$v0,$zero /* f1838f0: 24050009 */ addiu $a1,$zero,0x9 @@ -13610,7 +13610,7 @@ glabel func0f1845bc .L0f184698: /* f184698: 16910008 */ bne $s4,$s1,.L0f1846bc /* f18469c: 02802025 */ or $a0,$s4,$zero -/* f1846a0: 0fc5b9f1 */ jal textGet +/* f1846a0: 0fc5b9f1 */ jal langGet /* f1846a4: 2404540d */ addiu $a0,$zero,0x540d /* f1846a8: 02402025 */ or $a0,$s2,$zero /* f1846ac: 0c004dad */ jal sprintf @@ -13626,7 +13626,7 @@ glabel func0f1845bc /* f1846d0: 02202825 */ or $a1,$s1,$zero /* f1846d4: 10400009 */ beqz $v0,.L0f1846fc /* f1846d8: 00000000 */ sll $zero,$zero,0x0 -/* f1846dc: 0fc5b9f1 */ jal textGet +/* f1846dc: 0fc5b9f1 */ jal langGet /* f1846e0: 2404540e */ addiu $a0,$zero,0x540e /* f1846e4: 02402025 */ or $a0,$s2,$zero /* f1846e8: 00402825 */ or $a1,$v0,$zero @@ -13635,7 +13635,7 @@ glabel func0f1845bc /* f1846f4: 10000008 */ beqz $zero,.L0f184718 /* f1846f8: 02202025 */ or $a0,$s1,$zero .L0f1846fc: -/* f1846fc: 0fc5b9f1 */ jal textGet +/* f1846fc: 0fc5b9f1 */ jal langGet /* f184700: 2404540f */ addiu $a0,$zero,0x540f /* f184704: 02402025 */ or $a0,$s2,$zero /* f184708: 00402825 */ or $a1,$v0,$zero @@ -13716,12 +13716,12 @@ glabel func0f1847b8 /* f18480c: 3c03800b */ lui $v1,%hi(g_ScenarioData) /* f184810: 1040000d */ beqz $v0,.L0f184848 /* f184814: 2463c110 */ addiu $v1,$v1,%lo(g_ScenarioData) -/* f184818: 0fc5b9f1 */ jal textGet +/* f184818: 0fc5b9f1 */ jal langGet /* f18481c: 24045408 */ addiu $a0,$zero,0x5408 /* f184820: 02002025 */ or $a0,$s0,$zero /* f184824: 0fc619ae */ jal func0f1866b8 /* f184828: 00402825 */ or $a1,$v0,$zero -/* f18482c: 0fc5b9f1 */ jal textGet +/* f18482c: 0fc5b9f1 */ jal langGet /* f184830: 24045409 */ addiu $a0,$zero,0x5409 /* f184834: 02002025 */ or $a0,$s0,$zero /* f184838: 0fc619ae */ jal func0f1866b8 @@ -13734,17 +13734,17 @@ glabel func0f1847b8 /* f184850: 844a0020 */ lh $t2,0x20($v0) /* f184854: 2404540a */ addiu $a0,$zero,0x540a /* f184858: 254b0001 */ addiu $t3,$t2,0x1 -/* f18485c: 0fc5b9f1 */ jal textGet +/* f18485c: 0fc5b9f1 */ jal langGet /* f184860: a44b0020 */ sh $t3,0x20($v0) /* f184864: 02002025 */ or $a0,$s0,$zero /* f184868: 0fc619ae */ jal func0f1866b8 /* f18486c: 00402825 */ or $a1,$v0,$zero -/* f184870: 0fc5b9f1 */ jal textGet +/* f184870: 0fc5b9f1 */ jal langGet /* f184874: 2404540b */ addiu $a0,$zero,0x540b /* f184878: 02002025 */ or $a0,$s0,$zero /* f18487c: 0fc619ae */ jal func0f1866b8 /* f184880: 00402825 */ or $a1,$v0,$zero -/* f184884: 0fc5b9f1 */ jal textGet +/* f184884: 0fc5b9f1 */ jal langGet /* f184888: 2404540c */ addiu $a0,$zero,0x540c /* f18488c: 02002025 */ or $a0,$s0,$zero /* f184890: 0fc619ae */ jal func0f1866b8 @@ -13845,7 +13845,7 @@ glabel scenarioPacCallback10 /* f1849d4: 01381021 */ addu $v0,$t1,$t8 /* f1849d8: 84590038 */ lh $t9,0x38($v0) /* f1849dc: 272a0001 */ addiu $t2,$t9,0x1 -/* f1849e0: 0fc5b9f1 */ jal textGet +/* f1849e0: 0fc5b9f1 */ jal langGet /* f1849e4: a44a0038 */ sh $t2,0x38($v0) /* f1849e8: 3c0b800b */ lui $t3,0x800b /* f1849ec: 8d6bc114 */ lw $t3,-0x3eec($t3) @@ -13877,7 +13877,7 @@ glabel scenarioPacCallback10 // if (g_ScenarioData.pac.age240 > SECSTOFRAMES240(60)) { // g_ScenarioData.pac.age240 = 0; // g_ScenarioData.pac.wincounts[g_ScenarioData.pac.victims[g_ScenarioData.pac.victimindex]]++; -// func0f1866b8(g_ScenarioData.pac.victims[g_ScenarioData.pac.victimindex], textGet(0x5407)); // "Have a point for living!" +// func0f1866b8(g_ScenarioData.pac.victims[g_ScenarioData.pac.victimindex], langGet(0x5407)); // "Have a point for living!" // } // } // } @@ -14258,7 +14258,7 @@ glabel func0f184fb0 /* f184fcc: 3c048008 */ lui $a0,0x8008 /* f184fd0: afbf0014 */ sw $ra,0x14($sp) /* f184fd4: 008f2021 */ addu $a0,$a0,$t7 -/* f184fd8: 0fc5b9f1 */ jal textGet +/* f184fd8: 0fc5b9f1 */ jal langGet /* f184fdc: 9484714a */ lhu $a0,0x714a($a0) /* f184fe0: 3c048007 */ lui $a0,0x8007 /* f184fe4: 3c057f1c */ lui $a1,0x7f1c @@ -14285,7 +14285,7 @@ glabel func0f18500c /* f185028: 3c048008 */ lui $a0,0x8008 /* f18502c: afbf0014 */ sw $ra,0x14($sp) /* f185030: 008f2021 */ addu $a0,$a0,$t7 -/* f185034: 0fc5b9f1 */ jal textGet +/* f185034: 0fc5b9f1 */ jal langGet /* f185038: 94847148 */ lhu $a0,0x7148($a0) /* f18503c: 3c048007 */ lui $a0,0x8007 /* f185040: 3c057f1c */ lui $a1,0x7f1c @@ -14386,7 +14386,7 @@ glabel menuhandler00185068 .L0f185194: /* f185194: 564c0006 */ bnel $s2,$t4,.L0f1851b0 /* f185198: 26520001 */ addiu $s2,$s2,0x1 -/* f18519c: 0fc5b9f1 */ jal textGet +/* f18519c: 0fc5b9f1 */ jal langGet /* f1851a0: 96040000 */ lhu $a0,0x0($s0) /* f1851a4: 1000006e */ beqz $zero,.L0f185360 /* f1851a8: 8fbf002c */ lw $ra,0x2c($sp) @@ -14476,7 +14476,7 @@ glabel menuhandler00185068 /* f1852c8: 8eaa0000 */ lw $t2,0x0($s5) /* f1852cc: 000a58c0 */ sll $t3,$t2,0x3 /* f1852d0: 026b6021 */ addu $t4,$s3,$t3 -/* f1852d4: 0fc5b9f1 */ jal textGet +/* f1852d4: 0fc5b9f1 */ jal langGet /* f1852d8: 95840004 */ lhu $a0,0x4($t4) /* f1852dc: 10000020 */ beqz $zero,.L0f185360 /* f1852e0: 8fbf002c */ lw $ra,0x2c($sp) @@ -14615,7 +14615,7 @@ glabel func0f185568 /* f1855e0: 0338c823 */ subu $t9,$t9,$t8 /* f1855e4: 0019c840 */ sll $t9,$t9,0x1 /* f1855e8: 00992021 */ addu $a0,$a0,$t9 -/* f1855ec: 0fc5b9f1 */ jal textGet +/* f1855ec: 0fc5b9f1 */ jal langGet /* f1855f0: 94847148 */ lhu $a0,0x7148($a0) /* f1855f4: 27b20040 */ addiu $s2,$sp,0x40 /* f1855f8: 3c057f1c */ lui $a1,0x7f1c @@ -15865,7 +15865,7 @@ glabel func0f186898 /* f1869b4: 0fc21f44 */ jal func0f087d10 /* f1869b8: 24040057 */ addiu $a0,$zero,0x57 .L0f1869bc: -/* f1869bc: 0fc5b9f1 */ jal textGet +/* f1869bc: 0fc5b9f1 */ jal langGet /* f1869c0: 24045400 */ addiu $a0,$zero,0x5400 /* f1869c4: 24040057 */ addiu $a0,$zero,0x57 /* f1869c8: 0fc28874 */ jal func0f0a21d0 @@ -16104,7 +16104,7 @@ glabel func0f186898 /* f186d0c: 0fc447a9 */ jal func0f111ea4 /* f186d10: 24040057 */ addiu $a0,$zero,0x57 .L0f186d14: -/* f186d14: 0fc5b9f1 */ jal textGet +/* f186d14: 0fc5b9f1 */ jal langGet /* f186d18: 24045404 */ addiu $a0,$zero,0x5404 /* f186d1c: 24040057 */ addiu $a0,$zero,0x57 /* f186d20: 0fc28874 */ jal func0f0a21d0 @@ -16120,7 +16120,7 @@ glabel func0f186898 /* f186d48: 27a400d4 */ addiu $a0,$sp,0xd4 /* f186d4c: 0c004dad */ jal sprintf /* f186d50: 00403825 */ or $a3,$v0,$zero -/* f186d54: 0fc5b9f1 */ jal textGet +/* f186d54: 0fc5b9f1 */ jal langGet /* f186d58: 24045405 */ addiu $a0,$zero,0x5405 /* f186d5c: 24040057 */ addiu $a0,$zero,0x57 /* f186d60: 0fc28874 */ jal func0f0a21d0 @@ -16130,7 +16130,7 @@ glabel func0f186898 /* f186d70: 8fa60050 */ lw $a2,0x50($sp) /* f186d74: 0c004dad */ jal sprintf /* f186d78: 00403825 */ or $a3,$v0,$zero -/* f186d7c: 0fc5b9f1 */ jal textGet +/* f186d7c: 0fc5b9f1 */ jal langGet /* f186d80: 24045406 */ addiu $a0,$zero,0x5406 /* f186d84: 24040057 */ addiu $a0,$zero,0x57 /* f186d88: 0fc28874 */ jal func0f0a21d0 @@ -16294,7 +16294,7 @@ glabel func0f186898 /* f186fb0: 24045401 */ addiu $a0,$zero,0x5401 /* f186fb4: 000f5880 */ sll $t3,$t7,0x2 /* f186fb8: 002b0821 */ addu $at,$at,$t3 -/* f186fbc: 0fc5b9f1 */ jal textGet +/* f186fbc: 0fc5b9f1 */ jal langGet /* f186fc0: ac39c168 */ sw $t9,-0x3e98($at) /* f186fc4: 24040057 */ addiu $a0,$zero,0x57 /* f186fc8: 0fc28874 */ jal func0f0a21d0 @@ -16312,7 +16312,7 @@ glabel func0f186898 /* f186ff8: 27a400d4 */ addiu $a0,$sp,0xd4 /* f186ffc: 0c004dad */ jal sprintf /* f187000: 8fa60050 */ lw $a2,0x50($sp) -/* f187004: 0fc5b9f1 */ jal textGet +/* f187004: 0fc5b9f1 */ jal langGet /* f187008: 24045402 */ addiu $a0,$zero,0x5402 /* f18700c: 24040057 */ addiu $a0,$zero,0x57 /* f187010: 0fc28874 */ jal func0f0a21d0 @@ -16322,7 +16322,7 @@ glabel func0f186898 /* f187020: 8fa60050 */ lw $a2,0x50($sp) /* f187024: 0c004dad */ jal sprintf /* f187028: 00403825 */ or $a3,$v0,$zero -/* f18702c: 0fc5b9f1 */ jal textGet +/* f18702c: 0fc5b9f1 */ jal langGet /* f187030: 24045403 */ addiu $a0,$zero,0x5403 /* f187034: 24040057 */ addiu $a0,$zero,0x57 /* f187038: 0fc28874 */ jal func0f0a21d0 @@ -16655,7 +16655,7 @@ glabel func0f187410 /* f1874cc: 256cfed0 */ addiu $t4,$t3,-304 /* f1874d0: 018d8021 */ addu $s0,$t4,$t5 .L0f1874d4: -/* f1874d4: 0fc5b9f1 */ jal textGet +/* f1874d4: 0fc5b9f1 */ jal langGet /* f1874d8: 24045400 */ addiu $a0,$zero,0x5400 /* f1874dc: 24040036 */ addiu $a0,$zero,0x36 /* f1874e0: 0fc28874 */ jal func0f0a21d0 diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 85ef4b0c0..22dd65914 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -914,7 +914,7 @@ glabel func0f18800c /* f1880b8: ae00004c */ sw $zero,0x4c($s0) /* f1880bc: 1220000b */ beqz $s1,.L0f1880ec /* f1880c0: a6000050 */ sh $zero,0x50($s0) -/* f1880c4: 0fc5b9f1 */ jal textGet +/* f1880c4: 0fc5b9f1 */ jal langGet /* f1880c8: 240459b5 */ addiu $a0,$zero,0x59b5 /* f1880cc: 3c057f1c */ lui $a1,0x7f1c /* f1880d0: 24a58a2c */ addiu $a1,$a1,-30164 @@ -1118,7 +1118,7 @@ glabel func0f18836c /* f188388: afb2001c */ sw $s2,0x1c($sp) /* f18838c: 15c00006 */ bnez $t6,.L0f1883a8 /* f188390: afb10018 */ sw $s1,0x18($sp) -/* f188394: 0fc5b9f1 */ jal textGet +/* f188394: 0fc5b9f1 */ jal langGet /* f188398: 240459b6 */ addiu $a0,$zero,0x59b6 /* f18839c: 02002025 */ or $a0,$s0,$zero /* f1883a0: 0c004c4c */ jal strcpy @@ -1131,7 +1131,7 @@ glabel func0f18836c /* f1883b4: 922f0000 */ lbu $t7,0x0($s1) /* f1883b8: 55e00007 */ bnezl $t7,.L0f1883d8 /* f1883bc: 26100001 */ addiu $s0,$s0,0x1 -/* f1883c0: 0fc5b9f1 */ jal textGet +/* f1883c0: 0fc5b9f1 */ jal langGet /* f1883c4: 26045608 */ addiu $a0,$s0,0x5608 /* f1883c8: 02202025 */ or $a0,$s1,$zero /* f1883cc: 0c004c4c */ jal strcpy @@ -1151,7 +1151,7 @@ glabel func0f18836c /* f1883fc: 92380000 */ lbu $t8,0x0($s1) /* f188400: 57000009 */ bnezl $t8,.L0f188428 /* f188404: 26100001 */ addiu $s0,$s0,0x1 -/* f188408: 0fc5b9f1 */ jal textGet +/* f188408: 0fc5b9f1 */ jal langGet /* f18840c: 240459b5 */ addiu $a0,$zero,0x59b5 /* f188410: 02202025 */ or $a0,$s1,$zero /* f188414: 02402825 */ or $a1,$s2,$zero @@ -1778,14 +1778,14 @@ glabel mpGetWeaponLabel /* f188c88: 2401005b */ addiu $at,$zero,0x5b /* f188c8c: 14800005 */ bnez $a0,.L0f188ca4 /* f188c90: 00000000 */ sll $zero,$zero,0x0 -/* f188c94: 0fc5b9f1 */ jal textGet +/* f188c94: 0fc5b9f1 */ jal langGet /* f188c98: 2404543a */ addiu $a0,$zero,0x543a /* f188c9c: 10000019 */ beqz $zero,.L0f188d04 /* f188ca0: 8fbf0024 */ lw $ra,0x24($sp) .L0f188ca4: /* f188ca4: 54810006 */ bnel $a0,$at,.L0f188cc0 /* f188ca8: 2401005c */ addiu $at,$zero,0x5c -/* f188cac: 0fc5b9f1 */ jal textGet +/* f188cac: 0fc5b9f1 */ jal langGet /* f188cb0: 2404543b */ addiu $a0,$zero,0x543b /* f188cb4: 10000013 */ beqz $zero,.L0f188d04 /* f188cb8: 8fbf0024 */ lw $ra,0x24($sp) @@ -1793,7 +1793,7 @@ glabel mpGetWeaponLabel .L0f188cc0: /* f188cc0: 14810005 */ bne $a0,$at,.L0f188cd8 /* f188cc4: 00000000 */ sll $zero,$zero,0x0 -/* f188cc8: 0fc5b9f1 */ jal textGet +/* f188cc8: 0fc5b9f1 */ jal langGet /* f188ccc: 2404543c */ addiu $a0,$zero,0x543c /* f188cd0: 1000000c */ beqz $zero,.L0f188d04 /* f188cd4: 8fbf0024 */ lw $ra,0x24($sp) @@ -2111,7 +2111,7 @@ glabel func0f1890a8 /* f1890c4: 54200006 */ bnezl $at,.L0f1890e0 /* f1890c8: 2401000d */ addiu $at,$zero,0xd .L0f1890cc: -/* f1890cc: 0fc5b9f1 */ jal textGet +/* f1890cc: 0fc5b9f1 */ jal langGet /* f1890d0: 24045429 */ addiu $a0,$zero,0x5429 /* f1890d4: 10000016 */ beqz $zero,.L0f189130 /* f1890d8: 8fbf0014 */ lw $ra,0x14($sp) @@ -2119,7 +2119,7 @@ glabel func0f1890a8 .L0f1890e0: /* f1890e0: 54410006 */ bnel $v0,$at,.L0f1890fc /* f1890e4: 2401000c */ addiu $at,$zero,0xc -/* f1890e8: 0fc5b9f1 */ jal textGet +/* f1890e8: 0fc5b9f1 */ jal langGet /* f1890ec: 2404542a */ addiu $a0,$zero,0x542a /* f1890f0: 1000000f */ beqz $zero,.L0f189130 /* f1890f4: 8fbf0014 */ lw $ra,0x14($sp) @@ -2127,7 +2127,7 @@ glabel func0f1890a8 .L0f1890fc: /* f1890fc: 14410005 */ bne $v0,$at,.L0f189114 /* f189100: 000570c0 */ sll $t6,$a1,0x3 -/* f189104: 0fc5b9f1 */ jal textGet +/* f189104: 0fc5b9f1 */ jal langGet /* f189108: 2404542b */ addiu $a0,$zero,0x542b /* f18910c: 10000008 */ beqz $zero,.L0f189130 /* f189110: 8fbf0014 */ lw $ra,0x14($sp) @@ -2136,7 +2136,7 @@ glabel func0f1890a8 /* f189118: 000e7040 */ sll $t6,$t6,0x1 /* f18911c: 3c048008 */ lui $a0,0x8008 /* f189120: 008e2021 */ addu $a0,$a0,$t6 -/* f189124: 0fc5b9f1 */ jal textGet +/* f189124: 0fc5b9f1 */ jal langGet /* f189128: 948473f0 */ lhu $a0,0x73f0($a0) /* f18912c: 8fbf0014 */ lw $ra,0x14($sp) .L0f189130: @@ -2559,7 +2559,7 @@ glabel func0f18973c /* f1897a4: 0fc54d8a */ jal func0f153628 /* f1897a8: 00000000 */ sll $zero,$zero,0x0 /* f1897ac: afa200a0 */ sw $v0,0xa0($sp) -/* f1897b0: 0fc5b9f1 */ jal textGet +/* f1897b0: 0fc5b9f1 */ jal langGet /* f1897b4: 24045428 */ addiu $a0,$zero,0x5428 /* f1897b8: 27a4005c */ addiu $a0,$sp,0x5c /* f1897bc: 0c004c4c */ jal strcpy @@ -2716,7 +2716,7 @@ glabel func0f18973c /* f1899f4: 0fc54d8a */ jal func0f153628 /* f1899f8: 8fa400a0 */ lw $a0,0xa0($sp) /* f1899fc: afa200a0 */ sw $v0,0xa0($sp) -/* f189a00: 0fc5b9f1 */ jal textGet +/* f189a00: 0fc5b9f1 */ jal langGet /* f189a04: 24045427 */ addiu $a0,$zero,0x5427 /* f189a08: 27a4005c */ addiu $a0,$sp,0x5c /* f189a0c: 0c004c4c */ jal strcpy @@ -4701,7 +4701,7 @@ glabel func0f18a56c /* f18b5c0: ae6e002c */ sw $t6,0x2c($s3) /* f18b5c4: 032f8821 */ addu $s1,$t9,$t7 /* f18b5c8: 97040000 */ lhu $a0,0x0($t8) -/* f18b5cc: 0fc5b9f1 */ jal textGet +/* f18b5cc: 0fc5b9f1 */ jal langGet /* f18b5d0: 24120001 */ addiu $s2,$zero,0x1 /* f18b5d4: 8e2e0064 */ lw $t6,0x64($s1) /* f18b5d8: adc21974 */ sw $v0,0x1974($t6) @@ -4755,7 +4755,7 @@ glabel func0f18a56c /* f18b684: ae6f002c */ sw $t7,0x2c($s3) /* f18b688: 03198821 */ addu $s1,$t8,$t9 /* f18b68c: 95a40000 */ lhu $a0,0x0($t5) -/* f18b690: 0fc5b9f1 */ jal textGet +/* f18b690: 0fc5b9f1 */ jal langGet /* f18b694: 24120002 */ addiu $s2,$zero,0x2 /* f18b698: 8e2f0064 */ lw $t7,0x64($s1) /* f18b69c: ade21978 */ sw $v0,0x1978($t7) @@ -5165,7 +5165,7 @@ char *mpGetBodyName(u8 bodynum) bodynum = 0; } - return textGet(g_MpBodies[bodynum].name); + return langGet(g_MpBodies[bodynum].name); } u8 mpGetBodyUnk06(u8 bodynum) @@ -5591,7 +5591,7 @@ char *mpGetTrackName(s32 slotindex) { s32 tracknum = mpGetTrackNumAtSlotIndex(slotindex); - return textGet(g_MpTracks[tracknum].name); + return langGet(g_MpTracks[tracknum].name); } void mpSetUsingMultipleTunes(bool enable) @@ -6583,7 +6583,7 @@ glabel func0f18cddc /* f18cf50: 028d7021 */ addu $t6,$s4,$t5 /* f18cf54: 258f0001 */ addiu $t7,$t4,0x1 /* f18cf58: ae0f0000 */ sw $t7,0x0($s0) -/* f18cf5c: 0fc5b9f1 */ jal textGet +/* f18cf5c: 0fc5b9f1 */ jal langGet /* f18cf60: 85c40002 */ lh $a0,0x2($t6) /* f18cf64: 3c057f1c */ lui $a1,0x7f1c /* f18cf68: 24a58b74 */ addiu $a1,$a1,-29836 @@ -6597,7 +6597,7 @@ glabel func0f18cddc /* f18cf88: 1000000c */ beqz $zero,.L0f18cfbc /* f18cf8c: 26310001 */ addiu $s1,$s1,0x1 .L0f18cf90: -/* f18cf90: 0fc5b9f1 */ jal textGet +/* f18cf90: 0fc5b9f1 */ jal langGet /* f18cf94: 87240002 */ lh $a0,0x2($t9) /* f18cf98: 3c057f1c */ lui $a1,0x7f1c /* f18cf9c: 24a58b7c */ addiu $a1,$a1,-29828 @@ -7474,7 +7474,7 @@ glabel mpGetPresetNameBySlot /* f18dca0: 000e70c0 */ sll $t6,$t6,0x3 /* f18dca4: 3c048008 */ lui $a0,0x8008 /* f18dca8: 008e2021 */ addu $a0,$a0,$t6 -/* f18dcac: 0fc5b9f1 */ jal textGet +/* f18dcac: 0fc5b9f1 */ jal langGet /* f18dcb0: 94847b6c */ lhu $a0,0x7b6c($a0) /* f18dcb4: 10000008 */ beqz $zero,.L0f18dcd8 /* f18dcb8: 8fbf0024 */ lw $ra,0x24($sp) @@ -7560,7 +7560,7 @@ glabel func0f18dcec /* f18ddd0: 01d37023 */ subu $t6,$t6,$s3 /* f18ddd4: 15a1000a */ bne $t5,$at,.L0f18de00 /* f18ddd8: 02202025 */ or $a0,$s1,$zero -/* f18dddc: 0fc5b9f1 */ jal textGet +/* f18dddc: 0fc5b9f1 */ jal langGet /* f18dde0: 240454f1 */ addiu $a0,$zero,0x54f1 /* f18dde4: 26720001 */ addiu $s2,$s3,0x1 /* f18dde8: 02403025 */ or $a2,$s2,$zero @@ -12533,10 +12533,10 @@ glabel func0f1921f8 char *mpGetBotCommandName(s32 command) { if (command < 0 || command >= NUM_MPBOTCOMMANDS) { - return textGet(0x58b3); // "Normal" + return langGet(0x58b3); // "Normal" } - return textGet(g_MpBotCommands[command]); + return langGet(g_MpBotCommands[command]); } void func0f192438(struct chrdata *chr, struct prop *prop) diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index eeadcfb29..518f65f40 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -2177,7 +2177,7 @@ s32 mpGetNumAvailableChallenges(void) char *mpChallengeGetName(s32 challengeindex) { - return textGet(g_MpChallenges[challengeindex].name); + return langGet(g_MpChallenges[challengeindex].name); } GLOBAL_ASM( @@ -2332,7 +2332,7 @@ glabel func0f19b914 /* f19b918: afbf0014 */ sw $ra,0x14($sp) /* f19b91c: afa401c8 */ sw $a0,0x1c8($sp) /* f19b920: afa501cc */ sw $a1,0x1cc($sp) -/* f19b924: 0fc5b9b5 */ jal textGetLanguageId +/* f19b924: 0fc5b9b5 */ jal langGetLanguageId /* f19b928: afa601d0 */ sw $a2,0x1d0($sp) /* f19b92c: 3c0f8009 */ lui $t7,%hi(var800887c4) /* f19b930: 25ef87c4 */ addiu $t7,$t7,%lo(var800887c4) @@ -3005,7 +3005,7 @@ s32 mpGetNumChallengesAvailable(s32 mpchrnum) char *mpChallengeGetNameWithArg(s32 arg0, s32 challengeindex) { - return textGet(g_MpChallenges[challengeindex].name); + return langGet(g_MpChallenges[challengeindex].name); } bool func0f19c3bc(s32 mpchrnum, s32 index, s32 numplayers) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 6c6359872..2d81d0b80 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -1960,7 +1960,7 @@ glabel func0f19df18 /* f19df34: 90580001 */ lbu $t8,0x1($v0) /* f19df38: 00194a00 */ sll $t1,$t9,0x8 /* f19df3c: 03091825 */ or $v1,$t8,$t1 -/* f19df40: 0fc5b9f1 */ jal textGet +/* f19df40: 0fc5b9f1 */ jal langGet /* f19df44: 3064ffff */ andi $a0,$v1,0xffff /* f19df48: 8fbf0014 */ lw $ra,0x14($sp) /* f19df4c: 27bd0018 */ addiu $sp,$sp,0x18 @@ -2781,135 +2781,135 @@ glabel func0f19ea80 /* f19eab0: 8c2e9428 */ lw $t6,%lo(var7f1b9428)($at) /* f19eab4: 01c00008 */ jr $t6 /* f19eab8: 00000000 */ sll $zero,$zero,0x0 -/* f19eabc: 0fc5b9f1 */ jal textGet +/* f19eabc: 0fc5b9f1 */ jal langGet /* f19eac0: 24045979 */ addiu $a0,$zero,0x5979 /* f19eac4: 10000082 */ beqz $zero,.L0f19ecd0 /* f19eac8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eacc: 0fc5b9f1 */ jal textGet +/* f19eacc: 0fc5b9f1 */ jal langGet /* f19ead0: 2404597a */ addiu $a0,$zero,0x597a /* f19ead4: 1000007e */ beqz $zero,.L0f19ecd0 /* f19ead8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eadc: 0fc5b9f1 */ jal textGet +/* f19eadc: 0fc5b9f1 */ jal langGet /* f19eae0: 2404597b */ addiu $a0,$zero,0x597b /* f19eae4: 1000007a */ beqz $zero,.L0f19ecd0 /* f19eae8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eaec: 0fc5b9f1 */ jal textGet +/* f19eaec: 0fc5b9f1 */ jal langGet /* f19eaf0: 2404597c */ addiu $a0,$zero,0x597c /* f19eaf4: 10000076 */ beqz $zero,.L0f19ecd0 /* f19eaf8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eafc: 0fc5b9f1 */ jal textGet +/* f19eafc: 0fc5b9f1 */ jal langGet /* f19eb00: 2404597d */ addiu $a0,$zero,0x597d /* f19eb04: 10000072 */ beqz $zero,.L0f19ecd0 /* f19eb08: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb0c: 0fc5b9f1 */ jal textGet +/* f19eb0c: 0fc5b9f1 */ jal langGet /* f19eb10: 2404597e */ addiu $a0,$zero,0x597e /* f19eb14: 1000006e */ beqz $zero,.L0f19ecd0 /* f19eb18: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb1c: 0fc5b9f1 */ jal textGet +/* f19eb1c: 0fc5b9f1 */ jal langGet /* f19eb20: 2404597f */ addiu $a0,$zero,0x597f /* f19eb24: 1000006a */ beqz $zero,.L0f19ecd0 /* f19eb28: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb2c: 0fc5b9f1 */ jal textGet +/* f19eb2c: 0fc5b9f1 */ jal langGet /* f19eb30: 24045980 */ addiu $a0,$zero,0x5980 /* f19eb34: 10000066 */ beqz $zero,.L0f19ecd0 /* f19eb38: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb3c: 0fc5b9f1 */ jal textGet +/* f19eb3c: 0fc5b9f1 */ jal langGet /* f19eb40: 24045981 */ addiu $a0,$zero,0x5981 /* f19eb44: 10000062 */ beqz $zero,.L0f19ecd0 /* f19eb48: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb4c: 0fc5b9f1 */ jal textGet +/* f19eb4c: 0fc5b9f1 */ jal langGet /* f19eb50: 24045982 */ addiu $a0,$zero,0x5982 /* f19eb54: 1000005e */ beqz $zero,.L0f19ecd0 /* f19eb58: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb5c: 0fc5b9f1 */ jal textGet +/* f19eb5c: 0fc5b9f1 */ jal langGet /* f19eb60: 24045983 */ addiu $a0,$zero,0x5983 /* f19eb64: 1000005a */ beqz $zero,.L0f19ecd0 /* f19eb68: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb6c: 0fc5b9f1 */ jal textGet +/* f19eb6c: 0fc5b9f1 */ jal langGet /* f19eb70: 24045984 */ addiu $a0,$zero,0x5984 /* f19eb74: 10000056 */ beqz $zero,.L0f19ecd0 /* f19eb78: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb7c: 0fc5b9f1 */ jal textGet +/* f19eb7c: 0fc5b9f1 */ jal langGet /* f19eb80: 24045985 */ addiu $a0,$zero,0x5985 /* f19eb84: 10000052 */ beqz $zero,.L0f19ecd0 /* f19eb88: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb8c: 0fc5b9f1 */ jal textGet +/* f19eb8c: 0fc5b9f1 */ jal langGet /* f19eb90: 24045986 */ addiu $a0,$zero,0x5986 /* f19eb94: 1000004e */ beqz $zero,.L0f19ecd0 /* f19eb98: 8fbf0014 */ lw $ra,0x14($sp) -/* f19eb9c: 0fc5b9f1 */ jal textGet +/* f19eb9c: 0fc5b9f1 */ jal langGet /* f19eba0: 24045987 */ addiu $a0,$zero,0x5987 /* f19eba4: 1000004a */ beqz $zero,.L0f19ecd0 /* f19eba8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ebac: 0fc5b9f1 */ jal textGet +/* f19ebac: 0fc5b9f1 */ jal langGet /* f19ebb0: 24045988 */ addiu $a0,$zero,0x5988 /* f19ebb4: 10000046 */ beqz $zero,.L0f19ecd0 /* f19ebb8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ebbc: 0fc5b9f1 */ jal textGet +/* f19ebbc: 0fc5b9f1 */ jal langGet /* f19ebc0: 24045989 */ addiu $a0,$zero,0x5989 /* f19ebc4: 10000042 */ beqz $zero,.L0f19ecd0 /* f19ebc8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ebcc: 0fc5b9f1 */ jal textGet +/* f19ebcc: 0fc5b9f1 */ jal langGet /* f19ebd0: 2404598a */ addiu $a0,$zero,0x598a /* f19ebd4: 1000003e */ beqz $zero,.L0f19ecd0 /* f19ebd8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ebdc: 0fc5b9f1 */ jal textGet +/* f19ebdc: 0fc5b9f1 */ jal langGet /* f19ebe0: 2404598b */ addiu $a0,$zero,0x598b /* f19ebe4: 1000003a */ beqz $zero,.L0f19ecd0 /* f19ebe8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ebec: 0fc5b9f1 */ jal textGet +/* f19ebec: 0fc5b9f1 */ jal langGet /* f19ebf0: 2404598c */ addiu $a0,$zero,0x598c /* f19ebf4: 10000036 */ beqz $zero,.L0f19ecd0 /* f19ebf8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ebfc: 0fc5b9f1 */ jal textGet +/* f19ebfc: 0fc5b9f1 */ jal langGet /* f19ec00: 2404598d */ addiu $a0,$zero,0x598d /* f19ec04: 10000032 */ beqz $zero,.L0f19ecd0 /* f19ec08: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec0c: 0fc5b9f1 */ jal textGet +/* f19ec0c: 0fc5b9f1 */ jal langGet /* f19ec10: 2404598e */ addiu $a0,$zero,0x598e /* f19ec14: 1000002e */ beqz $zero,.L0f19ecd0 /* f19ec18: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec1c: 0fc5b9f1 */ jal textGet +/* f19ec1c: 0fc5b9f1 */ jal langGet /* f19ec20: 2404598f */ addiu $a0,$zero,0x598f /* f19ec24: 1000002a */ beqz $zero,.L0f19ecd0 /* f19ec28: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec2c: 0fc5b9f1 */ jal textGet +/* f19ec2c: 0fc5b9f1 */ jal langGet /* f19ec30: 24045990 */ addiu $a0,$zero,0x5990 /* f19ec34: 10000026 */ beqz $zero,.L0f19ecd0 /* f19ec38: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec3c: 0fc5b9f1 */ jal textGet +/* f19ec3c: 0fc5b9f1 */ jal langGet /* f19ec40: 24045991 */ addiu $a0,$zero,0x5991 /* f19ec44: 10000022 */ beqz $zero,.L0f19ecd0 /* f19ec48: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec4c: 0fc5b9f1 */ jal textGet +/* f19ec4c: 0fc5b9f1 */ jal langGet /* f19ec50: 24045992 */ addiu $a0,$zero,0x5992 /* f19ec54: 1000001e */ beqz $zero,.L0f19ecd0 /* f19ec58: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec5c: 0fc5b9f1 */ jal textGet +/* f19ec5c: 0fc5b9f1 */ jal langGet /* f19ec60: 24045993 */ addiu $a0,$zero,0x5993 /* f19ec64: 1000001a */ beqz $zero,.L0f19ecd0 /* f19ec68: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec6c: 0fc5b9f1 */ jal textGet +/* f19ec6c: 0fc5b9f1 */ jal langGet /* f19ec70: 24045994 */ addiu $a0,$zero,0x5994 /* f19ec74: 10000016 */ beqz $zero,.L0f19ecd0 /* f19ec78: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec7c: 0fc5b9f1 */ jal textGet +/* f19ec7c: 0fc5b9f1 */ jal langGet /* f19ec80: 24045995 */ addiu $a0,$zero,0x5995 /* f19ec84: 10000012 */ beqz $zero,.L0f19ecd0 /* f19ec88: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec8c: 0fc5b9f1 */ jal textGet +/* f19ec8c: 0fc5b9f1 */ jal langGet /* f19ec90: 24045996 */ addiu $a0,$zero,0x5996 /* f19ec94: 1000000e */ beqz $zero,.L0f19ecd0 /* f19ec98: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ec9c: 0fc5b9f1 */ jal textGet +/* f19ec9c: 0fc5b9f1 */ jal langGet /* f19eca0: 24045997 */ addiu $a0,$zero,0x5997 /* f19eca4: 1000000a */ beqz $zero,.L0f19ecd0 /* f19eca8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ecac: 0fc5b9f1 */ jal textGet +/* f19ecac: 0fc5b9f1 */ jal langGet /* f19ecb0: 24045998 */ addiu $a0,$zero,0x5998 /* f19ecb4: 10000006 */ beqz $zero,.L0f19ecd0 /* f19ecb8: 8fbf0014 */ lw $ra,0x14($sp) -/* f19ecbc: 0fc5b9f1 */ jal textGet +/* f19ecbc: 0fc5b9f1 */ jal langGet /* f19ecc0: 24045999 */ addiu $a0,$zero,0x5999 /* f19ecc4: 10000002 */ beqz $zero,.L0f19ecd0 /* f19ecc8: 8fbf0014 */ lw $ra,0x14($sp) @@ -5540,7 +5540,7 @@ glabel func0f1a1184 /* f1a1194: 908488a0 */ lbu $a0,-0x7760($a0) /* f1a1198: 0fc68429 */ jal func0f1a10a4 /* f1a119c: 00402025 */ or $a0,$v0,$zero -/* f1a11a0: 0fc5b9f1 */ jal textGet +/* f1a11a0: 0fc5b9f1 */ jal langGet /* f1a11a4: 8c44000c */ lw $a0,0xc($v0) /* f1a11a8: 8fbf0014 */ lw $ra,0x14($sp) /* f1a11ac: 27bd0018 */ addiu $sp,$sp,0x18 @@ -5778,7 +5778,7 @@ glabel func0f1a1468 /* f1a1484: 01c22023 */ subu $a0,$t6,$v0 /* f1a1488: 0fc684a2 */ jal func0f1a1288 /* f1a148c: 00402025 */ or $a0,$v0,$zero -/* f1a1490: 0fc5b9f1 */ jal textGet +/* f1a1490: 0fc5b9f1 */ jal langGet /* f1a1494: 8c440004 */ lw $a0,0x4($v0) /* f1a1498: 8fbf0014 */ lw $ra,0x14($sp) /* f1a149c: 27bd0018 */ addiu $sp,$sp,0x18 @@ -6041,7 +6041,7 @@ glabel func0f1a17e4 /* f1a17f4: 90848964 */ lbu $a0,-0x769c($a0) /* f1a17f8: 0fc6852d */ jal func0f1a14b4 /* f1a17fc: 00402025 */ or $a0,$v0,$zero -/* f1a1800: 0fc5b9f1 */ jal textGet +/* f1a1800: 0fc5b9f1 */ jal langGet /* f1a1804: 8c440004 */ lw $a0,0x4($v0) /* f1a1808: 8fbf0014 */ lw $ra,0x14($sp) /* f1a180c: 27bd0018 */ addiu $sp,$sp,0x18 @@ -6557,7 +6557,7 @@ glabel func0f1a1e90 /* f1a1edc: 90848ad8 */ lbu $a0,-0x7528($a0) /* f1a1ee0: 00024880 */ sll $t1,$v0,0x2 /* f1a1ee4: 03a92021 */ addu $a0,$sp,$t1 -/* f1a1ee8: 0fc5b9f1 */ jal textGet +/* f1a1ee8: 0fc5b9f1 */ jal langGet /* f1a1eec: 8c840020 */ lw $a0,0x20($a0) /* f1a1ef0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a1ef4: 27bd0048 */ addiu $sp,$sp,0x48 @@ -6590,7 +6590,7 @@ glabel func0f1a1f00 /* f1a1f4c: 90848ad8 */ lbu $a0,-0x7528($a0) /* f1a1f50: 00024880 */ sll $t1,$v0,0x2 /* f1a1f54: 03a92021 */ addu $a0,$sp,$t1 -/* f1a1f58: 0fc5b9f1 */ jal textGet +/* f1a1f58: 0fc5b9f1 */ jal langGet /* f1a1f5c: 8c840020 */ lw $a0,0x20($a0) /* f1a1f60: 8fbf0014 */ lw $ra,0x14($sp) /* f1a1f64: 27bd0048 */ addiu $sp,$sp,0x48 @@ -6623,7 +6623,7 @@ glabel func0f1a1f70 /* f1a1fbc: 90848ad8 */ lbu $a0,-0x7528($a0) /* f1a1fc0: 00024880 */ sll $t1,$v0,0x2 /* f1a1fc4: 03a92021 */ addu $a0,$sp,$t1 -/* f1a1fc8: 0fc5b9f1 */ jal textGet +/* f1a1fc8: 0fc5b9f1 */ jal langGet /* f1a1fcc: 8c840020 */ lw $a0,0x20($a0) /* f1a1fd0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a1fd4: 27bd0048 */ addiu $sp,$sp,0x48 @@ -7058,7 +7058,7 @@ glabel func0f1a2554 /* f1a259c: ac590014 */ sw $t9,0x14($v0) /* f1a25a0: 8dc10018 */ lw $at,0x18($t6) /* f1a25a4: ac410018 */ sw $at,0x18($v0) -/* f1a25a8: 0fc5b9f1 */ jal textGet +/* f1a25a8: 0fc5b9f1 */ jal langGet /* f1a25ac: 8d240000 */ lw $a0,0x0($t1) /* f1a25b0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a25b4: 27bd0038 */ addiu $sp,$sp,0x38 @@ -7121,7 +7121,7 @@ glabel func0f1a2624 /* f1a2678: 90848bb4 */ lbu $a0,-0x744c($a0) /* f1a267c: 00024880 */ sll $t1,$v0,0x2 /* f1a2680: 03a92021 */ addu $a0,$sp,$t1 -/* f1a2684: 0fc5b9f1 */ jal textGet +/* f1a2684: 0fc5b9f1 */ jal langGet /* f1a2688: 8c84001c */ lw $a0,0x1c($a0) /* f1a268c: 8fbf0014 */ lw $ra,0x14($sp) /* f1a2690: 27bd0038 */ addiu $sp,$sp,0x38 @@ -7155,7 +7155,7 @@ glabel func0f1a269c /* f1a26f0: 90848bb4 */ lbu $a0,-0x744c($a0) /* f1a26f4: 00024880 */ sll $t1,$v0,0x2 /* f1a26f8: 03a92021 */ addu $a0,$sp,$t1 -/* f1a26fc: 0fc5b9f1 */ jal textGet +/* f1a26fc: 0fc5b9f1 */ jal langGet /* f1a2700: 8c84001c */ lw $a0,0x1c($a0) /* f1a2704: 8fbf0014 */ lw $ra,0x14($sp) /* f1a2708: 27bd0038 */ addiu $sp,$sp,0x38 @@ -7189,7 +7189,7 @@ glabel func0f1a2714 /* f1a2768: 90848bb4 */ lbu $a0,-0x744c($a0) /* f1a276c: 00024880 */ sll $t1,$v0,0x2 /* f1a2770: 03a92021 */ addu $a0,$sp,$t1 -/* f1a2774: 0fc5b9f1 */ jal textGet +/* f1a2774: 0fc5b9f1 */ jal langGet /* f1a2778: 8c84001c */ lw $a0,0x1c($a0) /* f1a277c: 8fbf0014 */ lw $ra,0x14($sp) /* f1a2780: 27bd0038 */ addiu $sp,$sp,0x38 @@ -7202,7 +7202,7 @@ glabel func0f1a278c /* f1a278c: 27bdffe8 */ addiu $sp,$sp,-24 /* f1a2790: afbf0014 */ sw $ra,0x14($sp) /* f1a2794: afa40018 */ sw $a0,0x18($sp) -/* f1a2798: 0fc5b9f1 */ jal textGet +/* f1a2798: 0fc5b9f1 */ jal langGet /* f1a279c: 240459a1 */ addiu $a0,$zero,0x59a1 /* f1a27a0: 3c057f1c */ lui $a1,0x7f1c /* f1a27a4: 3c07800b */ lui $a3,0x800b @@ -7255,7 +7255,7 @@ glabel func0f1a2824 /* f1a2830: afbf0014 */ sw $ra,0x14($sp) /* f1a2834: 11c0000c */ beqz $t6,.L0f1a2868 /* f1a2838: afa40018 */ sw $a0,0x18($sp) -/* f1a283c: 0fc5b9f1 */ jal textGet +/* f1a283c: 0fc5b9f1 */ jal langGet /* f1a2840: 240459a2 */ addiu $a0,$zero,0x59a2 /* f1a2844: 3c057f1c */ lui $a1,0x7f1c /* f1a2848: 3c07800b */ lui $a3,0x800b @@ -7336,7 +7336,7 @@ glabel func0f1a293c /* f1a2940: afbf0014 */ sw $ra,0x14($sp) /* f1a2944: afa40018 */ sw $a0,0x18($sp) /* f1a2948: afa5001c */ sw $a1,0x1c($sp) -/* f1a294c: 0fc5b9f1 */ jal textGet +/* f1a294c: 0fc5b9f1 */ jal langGet /* f1a2950: 240459a3 */ addiu $a0,$zero,0x59a3 /* f1a2954: 3c057f1c */ lui $a1,0x7f1c /* f1a2958: 3c07800b */ lui $a3,0x800b @@ -7458,7 +7458,7 @@ glabel func0f1a2ad0 /* f1a2ae4: 2841ff4c */ slti $at,$v0,-180 /* f1a2ae8: 1020000a */ beqz $at,.L0f1a2b14 /* f1a2aec: afa40028 */ sw $a0,0x28($sp) -/* f1a2af0: 0fc5b9f1 */ jal textGet +/* f1a2af0: 0fc5b9f1 */ jal langGet /* f1a2af4: 240459a4 */ addiu $a0,$zero,0x59a4 /* f1a2af8: 3c057f1c */ lui $a1,0x7f1c /* f1a2afc: 24a591d0 */ addiu $a1,$a1,-28208 @@ -7470,7 +7470,7 @@ glabel func0f1a2ad0 .L0f1a2b14: /* f1a2b14: 0443000b */ bgezl $v0,.L0f1a2b44 /* f1a2b18: 90620005 */ lbu $v0,0x5($v1) -/* f1a2b1c: 0fc5b9f1 */ jal textGet +/* f1a2b1c: 0fc5b9f1 */ jal langGet /* f1a2b20: 240459a5 */ addiu $a0,$zero,0x59a5 /* f1a2b24: 3c057f1c */ lui $a1,0x7f1c /* f1a2b28: 24a591d4 */ addiu $a1,$a1,-28204 @@ -7502,7 +7502,7 @@ glabel func0f1a2ad0 .L0f1a2b84: /* f1a2b84: afa30024 */ sw $v1,0x24($sp) .L0f1a2b88: -/* f1a2b88: 0fc5b9f1 */ jal textGet +/* f1a2b88: 0fc5b9f1 */ jal langGet /* f1a2b8c: afa70020 */ sw $a3,0x20($sp) /* f1a2b90: 8fa30024 */ lw $v1,0x24($sp) /* f1a2b94: 3c057f1c */ lui $a1,0x7f1c @@ -7582,7 +7582,7 @@ glabel func0f1a2bc4 /* f1a2c9c: 8c3997a0 */ lw $t9,%lo(var7f1b97a0)($at) /* f1a2ca0: 03200008 */ jr $t9 /* f1a2ca4: 00000000 */ sll $zero,$zero,0x0 -/* f1a2ca8: 0fc5b9f1 */ jal textGet +/* f1a2ca8: 0fc5b9f1 */ jal langGet /* f1a2cac: 8fa40024 */ lw $a0,0x24($sp) /* f1a2cb0: 3c057f1c */ lui $a1,0x7f1c /* f1a2cb4: 24a591f8 */ addiu $a1,$a1,-28168 @@ -7591,7 +7591,7 @@ glabel func0f1a2bc4 /* f1a2cc0: 00403025 */ or $a2,$v0,$zero /* f1a2cc4: 1000002c */ beqz $zero,.L0f1a2d78 /* f1a2cc8: 24020001 */ addiu $v0,$zero,0x1 -/* f1a2ccc: 0fc5b9f1 */ jal textGet +/* f1a2ccc: 0fc5b9f1 */ jal langGet /* f1a2cd0: 8fa40028 */ lw $a0,0x28($sp) /* f1a2cd4: 3c057f1c */ lui $a1,0x7f1c /* f1a2cd8: 24a591fc */ addiu $a1,$a1,-28164 @@ -7600,7 +7600,7 @@ glabel func0f1a2bc4 /* f1a2ce4: 00403025 */ or $a2,$v0,$zero /* f1a2ce8: 10000023 */ beqz $zero,.L0f1a2d78 /* f1a2cec: 24020001 */ addiu $v0,$zero,0x1 -/* f1a2cf0: 0fc5b9f1 */ jal textGet +/* f1a2cf0: 0fc5b9f1 */ jal langGet /* f1a2cf4: 8fa4002c */ lw $a0,0x2c($sp) /* f1a2cf8: 3c057f1c */ lui $a1,0x7f1c /* f1a2cfc: 24a59200 */ addiu $a1,$a1,-28160 @@ -7609,7 +7609,7 @@ glabel func0f1a2bc4 /* f1a2d08: 00403025 */ or $a2,$v0,$zero /* f1a2d0c: 1000001a */ beqz $zero,.L0f1a2d78 /* f1a2d10: 24020001 */ addiu $v0,$zero,0x1 -/* f1a2d14: 0fc5b9f1 */ jal textGet +/* f1a2d14: 0fc5b9f1 */ jal langGet /* f1a2d18: 8fa40030 */ lw $a0,0x30($sp) /* f1a2d1c: 3c057f1c */ lui $a1,0x7f1c /* f1a2d20: 24a59204 */ addiu $a1,$a1,-28156 @@ -7618,7 +7618,7 @@ glabel func0f1a2bc4 /* f1a2d2c: 00403025 */ or $a2,$v0,$zero /* f1a2d30: 10000011 */ beqz $zero,.L0f1a2d78 /* f1a2d34: 24020001 */ addiu $v0,$zero,0x1 -/* f1a2d38: 0fc5b9f1 */ jal textGet +/* f1a2d38: 0fc5b9f1 */ jal langGet /* f1a2d3c: 8fa40034 */ lw $a0,0x34($sp) /* f1a2d40: 3c057f1c */ lui $a1,0x7f1c /* f1a2d44: 24a59208 */ addiu $a1,$a1,-28152 diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index a8342f4ff..3838df05d 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -720,7 +720,7 @@ glabel menudialog001a3af4 /* f1a3bbc: 8cc90000 */ lw $t1,0x0($a2) /* f1a3bc0: 00095040 */ sll $t2,$t1,0x1 /* f1a3bc4: 004a5821 */ addu $t3,$v0,$t2 -/* f1a3bc8: 0fc5b9f1 */ jal textGet +/* f1a3bc8: 0fc5b9f1 */ jal langGet /* f1a3bcc: 95640000 */ lhu $a0,0x0($t3) /* f1a3bd0: 1000000e */ beqz $zero,.L0f1a3c0c /* f1a3bd4: 8fbf0014 */ lw $ra,0x14($sp) @@ -817,7 +817,7 @@ glabel menuhandlerFrDifficulty /* f1a3d10: 00002825 */ or $a1,$zero,$zero /* f1a3d14: 10400005 */ beqz $v0,.L0f1a3d2c /* f1a3d18: 00000000 */ sll $zero,$zero,0x0 -/* f1a3d1c: 0fc5b9f1 */ jal textGet +/* f1a3d1c: 0fc5b9f1 */ jal langGet /* f1a3d20: 94440004 */ lhu $a0,0x4($v0) /* f1a3d24: 10000004 */ beqz $zero,.L0f1a3d38 /* f1a3d28: 8fbf0014 */ lw $ra,0x14($sp) @@ -840,7 +840,7 @@ glabel menuhandlerFrDifficulty /* f1a3d64: 24050001 */ addiu $a1,$zero,0x1 /* f1a3d68: 10400005 */ beqz $v0,.L0f1a3d80 /* f1a3d6c: 00000000 */ sll $zero,$zero,0x0 -/* f1a3d70: 0fc5b9f1 */ jal textGet +/* f1a3d70: 0fc5b9f1 */ jal langGet /* f1a3d74: 94440004 */ lhu $a0,0x4($v0) /* f1a3d78: 10000004 */ beqz $zero,.L0f1a3d8c /* f1a3d7c: 8fbf0014 */ lw $ra,0x14($sp) @@ -872,7 +872,7 @@ glabel func0f1a3d98 /* f1a3dcc: 9049045b */ lbu $t1,0x45b($v0) /* f1a3dd0: 00095040 */ sll $t2,$t1,0x1 /* f1a3dd4: 03aa2021 */ addu $a0,$sp,$t2 -/* f1a3dd8: 0fc5b9f1 */ jal textGet +/* f1a3dd8: 0fc5b9f1 */ jal langGet /* f1a3ddc: 9484001c */ lhu $a0,0x1c($a0) /* f1a3de0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a3de4: 27bd0028 */ addiu $sp,$sp,0x28 @@ -896,7 +896,7 @@ glabel func0f1a3df0 /* f1a3e1c: 90490448 */ lbu $t1,0x448($v0) /* f1a3e20: 00095040 */ sll $t2,$t1,0x1 /* f1a3e24: 03aa2021 */ addu $a0,$sp,$t2 -/* f1a3e28: 0fc5b9f1 */ jal textGet +/* f1a3e28: 0fc5b9f1 */ jal langGet /* f1a3e2c: 94840020 */ lhu $a0,0x20($a0) /* f1a3e30: 8fbf0014 */ lw $ra,0x14($sp) /* f1a3e34: 27bd0028 */ addiu $sp,$sp,0x28 @@ -1113,7 +1113,7 @@ glabel func0f1a40e8 /* f1a40fc: 00001025 */ or $v0,$zero,$zero /* f1a4100: 19c0000c */ blez $t6,.L0f1a4134 /* f1a4104: 00000000 */ sll $zero,$zero,0x0 -/* f1a4108: 0fc5b9f1 */ jal textGet +/* f1a4108: 0fc5b9f1 */ jal langGet /* f1a410c: 240451db */ addiu $a0,$zero,0x51db /* f1a4110: 3c048007 */ lui $a0,0x8007 /* f1a4114: 3c057f1c */ lui $a1,0x7f1c @@ -1166,7 +1166,7 @@ glabel func0f1a4194 /* f1a41a4: 904e0008 */ lbu $t6,0x8($v0) /* f1a41a8: 59c0000c */ blezl $t6,.L0f1a41dc /* f1a41ac: 904f0004 */ lbu $t7,0x4($v0) -/* f1a41b0: 0fc5b9f1 */ jal textGet +/* f1a41b0: 0fc5b9f1 */ jal langGet /* f1a41b4: 240451d9 */ addiu $a0,$zero,0x51d9 /* f1a41b8: 3c048007 */ lui $a0,0x8007 /* f1a41bc: 3c057f1c */ lui $a1,0x7f1c @@ -1181,7 +1181,7 @@ glabel func0f1a4194 /* f1a41dc: 240100ff */ addiu $at,$zero,0xff /* f1a41e0: 11e1000b */ beq $t7,$at,.L0f1a4210 /* f1a41e4: 00000000 */ sll $zero,$zero,0x0 -/* f1a41e8: 0fc5b9f1 */ jal textGet +/* f1a41e8: 0fc5b9f1 */ jal langGet /* f1a41ec: 240451da */ addiu $a0,$zero,0x51da /* f1a41f0: 3c048007 */ lui $a0,0x8007 /* f1a41f4: 3c057f1c */ lui $a1,0x7f1c @@ -1256,7 +1256,7 @@ glabel func0f1a42b8 /* f1a42cc: 240100ff */ addiu $at,$zero,0xff /* f1a42d0: 11c1000b */ beq $t6,$at,.L0f1a4300 /* f1a42d4: 00000000 */ sll $zero,$zero,0x0 -/* f1a42d8: 0fc5b9f1 */ jal textGet +/* f1a42d8: 0fc5b9f1 */ jal langGet /* f1a42dc: 240451d8 */ addiu $a0,$zero,0x51d8 /* f1a42e0: 3c048007 */ lui $a0,0x8007 /* f1a42e4: 3c057f1c */ lui $a1,0x7f1c @@ -1337,7 +1337,7 @@ glabel func0f1a43b8 /* f1a43cc: 240100ff */ addiu $at,$zero,0xff /* f1a43d0: 11c1000b */ beq $t6,$at,.L0f1a4400 /* f1a43d4: 00000000 */ sll $zero,$zero,0x0 -/* f1a43d8: 0fc5b9f1 */ jal textGet +/* f1a43d8: 0fc5b9f1 */ jal langGet /* f1a43dc: 240451d7 */ addiu $a0,$zero,0x51d7 /* f1a43e0: 3c048007 */ lui $a0,0x8007 /* f1a43e4: 3c057f1c */ lui $a1,0x7f1c @@ -1992,7 +1992,7 @@ glabel menuhandler001a44c0 /* f1a4d60: 0fc5580f */ jal func0f15603c /* f1a4d64: afac001c */ sw $t4,0x1c($sp) /* f1a4d68: afa2015c */ sw $v0,0x15c($sp) -/* f1a4d6c: 0fc5b9f1 */ jal textGet +/* f1a4d6c: 0fc5b9f1 */ jal langGet /* f1a4d70: 240451cd */ addiu $a0,$zero,0x51cd /* f1a4d74: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a4d78: 0c004dad */ jal sprintf @@ -2132,7 +2132,7 @@ glabel menuhandler001a44c0 /* f1a4f90: 0fc5580f */ jal func0f15603c /* f1a4f94: afad001c */ sw $t5,0x1c($sp) /* f1a4f98: afa2015c */ sw $v0,0x15c($sp) -/* f1a4f9c: 0fc5b9f1 */ jal textGet +/* f1a4f9c: 0fc5b9f1 */ jal langGet /* f1a4fa0: 240451ce */ addiu $a0,$zero,0x51ce /* f1a4fa4: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a4fa8: 0c004dad */ jal sprintf @@ -2272,7 +2272,7 @@ glabel menuhandler001a44c0 /* f1a51c0: 0fc5580f */ jal func0f15603c /* f1a51c4: afac001c */ sw $t4,0x1c($sp) /* f1a51c8: afa2015c */ sw $v0,0x15c($sp) -/* f1a51cc: 0fc5b9f1 */ jal textGet +/* f1a51cc: 0fc5b9f1 */ jal langGet /* f1a51d0: 240451cf */ addiu $a0,$zero,0x51cf /* f1a51d4: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a51d8: 0c004dad */ jal sprintf @@ -2411,7 +2411,7 @@ glabel menuhandler001a44c0 /* f1a53ec: 0fc5580f */ jal func0f15603c /* f1a53f0: afad001c */ sw $t5,0x1c($sp) /* f1a53f4: afa2015c */ sw $v0,0x15c($sp) -/* f1a53f8: 0fc5b9f1 */ jal textGet +/* f1a53f8: 0fc5b9f1 */ jal langGet /* f1a53fc: 240451d0 */ addiu $a0,$zero,0x51d0 /* f1a5400: 8fb90140 */ lw $t9,0x140($sp) /* f1a5404: 27a400c0 */ addiu $a0,$sp,0xc0 @@ -2508,7 +2508,7 @@ glabel menuhandler001a44c0 /* f1a5570: 0fc5580f */ jal func0f15603c /* f1a5574: afaf001c */ sw $t7,0x1c($sp) /* f1a5578: afa2015c */ sw $v0,0x15c($sp) -/* f1a557c: 0fc5b9f1 */ jal textGet +/* f1a557c: 0fc5b9f1 */ jal langGet /* f1a5580: 240451d1 */ addiu $a0,$zero,0x51d1 /* f1a5584: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a5588: 0c004dad */ jal sprintf @@ -2609,7 +2609,7 @@ glabel menuhandler001a44c0 /* f1a5704: 0fc5580f */ jal func0f15603c /* f1a5708: afb8001c */ sw $t8,0x1c($sp) /* f1a570c: afa2015c */ sw $v0,0x15c($sp) -/* f1a5710: 0fc5b9f1 */ jal textGet +/* f1a5710: 0fc5b9f1 */ jal langGet /* f1a5714: 240451d2 */ addiu $a0,$zero,0x51d2 /* f1a5718: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a571c: 0c004dad */ jal sprintf @@ -2650,7 +2650,7 @@ glabel menuhandler001a44c0 /* f1a57a8: 0fc5580f */ jal func0f15603c /* f1a57ac: afb9001c */ sw $t9,0x1c($sp) /* f1a57b0: afa2015c */ sw $v0,0x15c($sp) -/* f1a57b4: 0fc5b9f1 */ jal textGet +/* f1a57b4: 0fc5b9f1 */ jal langGet /* f1a57b8: 240451d3 */ addiu $a0,$zero,0x51d3 /* f1a57bc: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a57c0: 0c004dad */ jal sprintf @@ -2697,7 +2697,7 @@ glabel menuhandler001a44c0 /* f1a5864: 0fc5580f */ jal func0f15603c /* f1a5868: afac001c */ sw $t4,0x1c($sp) /* f1a586c: afa2015c */ sw $v0,0x15c($sp) -/* f1a5870: 0fc5b9f1 */ jal textGet +/* f1a5870: 0fc5b9f1 */ jal langGet /* f1a5874: 240451d4 */ addiu $a0,$zero,0x51d4 /* f1a5878: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a587c: 0c004dad */ jal sprintf @@ -2744,7 +2744,7 @@ glabel menuhandler001a44c0 /* f1a5920: 0fc5580f */ jal func0f15603c /* f1a5924: afae001c */ sw $t6,0x1c($sp) /* f1a5928: afa2015c */ sw $v0,0x15c($sp) -/* f1a592c: 0fc5b9f1 */ jal textGet +/* f1a592c: 0fc5b9f1 */ jal langGet /* f1a5930: 240451d5 */ addiu $a0,$zero,0x51d5 /* f1a5934: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a5938: 0c004dad */ jal sprintf @@ -2791,7 +2791,7 @@ glabel menuhandler001a44c0 /* f1a59dc: 0fc5580f */ jal func0f15603c /* f1a59e0: afb8001c */ sw $t8,0x1c($sp) /* f1a59e4: afa2015c */ sw $v0,0x15c($sp) -/* f1a59e8: 0fc5b9f1 */ jal textGet +/* f1a59e8: 0fc5b9f1 */ jal langGet /* f1a59ec: 240451d6 */ addiu $a0,$zero,0x51d6 /* f1a59f0: 27a400c0 */ addiu $a0,$sp,0xc0 /* f1a59f4: 0c004dad */ jal sprintf @@ -3074,7 +3074,7 @@ glabel menuhandler001a5dc0 /* f1a5e60: 00402025 */ or $a0,$v0,$zero /* f1a5e64: 0fc68429 */ jal func0f1a10a4 /* f1a5e68: 00402025 */ or $a0,$v0,$zero -/* f1a5e6c: 0fc5b9f1 */ jal textGet +/* f1a5e6c: 0fc5b9f1 */ jal langGet /* f1a5e70: 8c440000 */ lw $a0,0x0($v0) /* f1a5e74: 10000031 */ beqz $zero,.L0f1a5f3c /* f1a5e78: 8fbf0014 */ lw $ra,0x14($sp) @@ -3083,7 +3083,7 @@ glabel menuhandler001a5dc0 /* f1a5e80: 00432023 */ subu $a0,$v0,$v1 /* f1a5e84: 0fc684a2 */ jal func0f1a1288 /* f1a5e88: 00402025 */ or $a0,$v0,$zero -/* f1a5e8c: 0fc5b9f1 */ jal textGet +/* f1a5e8c: 0fc5b9f1 */ jal langGet /* f1a5e90: 8c440000 */ lw $a0,0x0($v0) /* f1a5e94: 10000029 */ beqz $zero,.L0f1a5f3c /* f1a5e98: 8fbf0014 */ lw $ra,0x14($sp) @@ -3116,7 +3116,7 @@ glabel menuhandler001a5dc0 /* f1a5f00: 8cce0000 */ lw $t6,0x0($a2) /* f1a5f04: 000e78c0 */ sll $t7,$t6,0x3 /* f1a5f08: 03af2021 */ addu $a0,$sp,$t7 -/* f1a5f0c: 0fc5b9f1 */ jal textGet +/* f1a5f0c: 0fc5b9f1 */ jal langGet /* f1a5f10: 94840034 */ lhu $a0,0x34($a0) /* f1a5f14: 10000009 */ beqz $zero,.L0f1a5f3c /* f1a5f18: 8fbf0014 */ lw $ra,0x14($sp) @@ -3372,7 +3372,7 @@ glabel func0f1a628c /* f1a62a0: 908488a0 */ lbu $a0,-0x7760($a0) /* f1a62a4: 0fc68429 */ jal func0f1a10a4 /* f1a62a8: 00402025 */ or $a0,$v0,$zero -/* f1a62ac: 0fc5b9f1 */ jal textGet +/* f1a62ac: 0fc5b9f1 */ jal langGet /* f1a62b0: 8c440000 */ lw $a0,0x0($v0) /* f1a62b4: 3c048007 */ lui $a0,0x8007 /* f1a62b8: 3c057f1c */ lui $a1,0x7f1c @@ -3397,7 +3397,7 @@ glabel func0f1a62e0 /* f1a62f4: 908488a0 */ lbu $a0,-0x7760($a0) /* f1a62f8: 0fc68429 */ jal func0f1a10a4 /* f1a62fc: 00402025 */ or $a0,$v0,$zero -/* f1a6300: 0fc5b9f1 */ jal textGet +/* f1a6300: 0fc5b9f1 */ jal langGet /* f1a6304: 8c440008 */ lw $a0,0x8($v0) /* f1a6308: 3c048007 */ lui $a0,0x8007 /* f1a630c: 3c057f1c */ lui $a1,0x7f1c @@ -3422,7 +3422,7 @@ glabel func0f1a6334 /* f1a6348: 908488a0 */ lbu $a0,-0x7760($a0) /* f1a634c: 0fc68429 */ jal func0f1a10a4 /* f1a6350: 00402025 */ or $a0,$v0,$zero -/* f1a6354: 0fc5b9f1 */ jal textGet +/* f1a6354: 0fc5b9f1 */ jal langGet /* f1a6358: 8c440004 */ lw $a0,0x4($v0) /* f1a635c: 3c048007 */ lui $a0,0x8007 /* f1a6360: 3c057f1c */ lui $a1,0x7f1c @@ -3449,7 +3449,7 @@ glabel func0f1a6388 /* f1a63a4: 01c22023 */ subu $a0,$t6,$v0 /* f1a63a8: 0fc684a2 */ jal func0f1a1288 /* f1a63ac: 00402025 */ or $a0,$v0,$zero -/* f1a63b0: 0fc5b9f1 */ jal textGet +/* f1a63b0: 0fc5b9f1 */ jal langGet /* f1a63b4: 8c440000 */ lw $a0,0x0($v0) /* f1a63b8: 3c048007 */ lui $a0,0x8007 /* f1a63bc: 3c057f1c */ lui $a1,0x7f1c @@ -3730,12 +3730,12 @@ glabel func0f1a67b0 /* f1a67c4: 000e7fc2 */ srl $t7,$t6,0x1f /* f1a67c8: 11e00005 */ beqz $t7,.L0f1a67e0 /* f1a67cc: 00000000 */ sll $zero,$zero,0x0 -/* f1a67d0: 0fc5b9f1 */ jal textGet +/* f1a67d0: 0fc5b9f1 */ jal langGet /* f1a67d4: 240451ac */ addiu $a0,$zero,0x51ac /* f1a67d8: 10000004 */ beqz $zero,.L0f1a67ec /* f1a67dc: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a67e0: -/* f1a67e0: 0fc5b9f1 */ jal textGet +/* f1a67e0: 0fc5b9f1 */ jal langGet /* f1a67e4: 240451ab */ addiu $a0,$zero,0x51ab /* f1a67e8: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a67ec: @@ -3754,12 +3754,12 @@ glabel func0f1a67f8 /* f1a680c: 000e7fc2 */ srl $t7,$t6,0x1f /* f1a6810: 11e00005 */ beqz $t7,.L0f1a6828 /* f1a6814: 00000000 */ sll $zero,$zero,0x0 -/* f1a6818: 0fc5b9f1 */ jal textGet +/* f1a6818: 0fc5b9f1 */ jal langGet /* f1a681c: 240451ae */ addiu $a0,$zero,0x51ae /* f1a6820: 10000004 */ beqz $zero,.L0f1a6834 /* f1a6824: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a6828: -/* f1a6828: 0fc5b9f1 */ jal textGet +/* f1a6828: 0fc5b9f1 */ jal langGet /* f1a682c: 240451ad */ addiu $a0,$zero,0x51ad /* f1a6830: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a6834: @@ -3949,12 +3949,12 @@ glabel func0f1a6aec /* f1a6b00: 000e7fc2 */ srl $t7,$t6,0x1f /* f1a6b04: 11e00005 */ beqz $t7,.L0f1a6b1c /* f1a6b08: 00000000 */ sll $zero,$zero,0x0 -/* f1a6b0c: 0fc5b9f1 */ jal textGet +/* f1a6b0c: 0fc5b9f1 */ jal langGet /* f1a6b10: 240451ac */ addiu $a0,$zero,0x51ac /* f1a6b14: 10000004 */ beqz $zero,.L0f1a6b28 /* f1a6b18: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a6b1c: -/* f1a6b1c: 0fc5b9f1 */ jal textGet +/* f1a6b1c: 0fc5b9f1 */ jal langGet /* f1a6b20: 240451ab */ addiu $a0,$zero,0x51ab /* f1a6b24: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a6b28: @@ -3973,12 +3973,12 @@ glabel func0f1a6b34 /* f1a6b48: 000e7fc2 */ srl $t7,$t6,0x1f /* f1a6b4c: 11e00005 */ beqz $t7,.L0f1a6b64 /* f1a6b50: 00000000 */ sll $zero,$zero,0x0 -/* f1a6b54: 0fc5b9f1 */ jal textGet +/* f1a6b54: 0fc5b9f1 */ jal langGet /* f1a6b58: 240451ae */ addiu $a0,$zero,0x51ae /* f1a6b5c: 10000004 */ beqz $zero,.L0f1a6b70 /* f1a6b60: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a6b64: -/* f1a6b64: 0fc5b9f1 */ jal textGet +/* f1a6b64: 0fc5b9f1 */ jal langGet /* f1a6b68: 240451ad */ addiu $a0,$zero,0x51ad /* f1a6b6c: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a6b70: @@ -4068,7 +4068,7 @@ glabel func0f1a6c8c /* f1a6ca0: 90848964 */ lbu $a0,-0x769c($a0) /* f1a6ca4: 0fc6852d */ jal func0f1a14b4 /* f1a6ca8: 00402025 */ or $a0,$v0,$zero -/* f1a6cac: 0fc5b9f1 */ jal textGet +/* f1a6cac: 0fc5b9f1 */ jal langGet /* f1a6cb0: 8c440000 */ lw $a0,0x0($v0) /* f1a6cb4: 8fbf0014 */ lw $ra,0x14($sp) /* f1a6cb8: 27bd0018 */ addiu $sp,$sp,0x18 @@ -4087,7 +4087,7 @@ glabel func0f1a6cc4 /* f1a6cdc: afa0001c */ sw $zero,0x1c($sp) /* f1a6ce0: 0fc6852d */ jal func0f1a14b4 /* f1a6ce4: 00402025 */ or $a0,$v0,$zero -/* f1a6ce8: 0fc5b9f1 */ jal textGet +/* f1a6ce8: 0fc5b9f1 */ jal langGet /* f1a6cec: 8c440000 */ lw $a0,0x0($v0) /* f1a6cf0: 904e0000 */ lbu $t6,0x0($v0) /* f1a6cf4: 2404007c */ addiu $a0,$zero,0x7c @@ -4156,7 +4156,7 @@ glabel menuhandler001a6d4c /* f1a6dd8: 8cc40000 */ lw $a0,0x0($a2) /* f1a6ddc: 0fc6852d */ jal func0f1a14b4 /* f1a6de0: 00402025 */ or $a0,$v0,$zero -/* f1a6de4: 0fc5b9f1 */ jal textGet +/* f1a6de4: 0fc5b9f1 */ jal langGet /* f1a6de8: 8c440000 */ lw $a0,0x0($v0) /* f1a6dec: 1000002a */ beqz $zero,.L0f1a6e98 /* f1a6df0: 8fbf0014 */ lw $ra,0x14($sp) @@ -4190,7 +4190,7 @@ glabel menuhandler001a6d4c /* f1a6e5c: 8cd90000 */ lw $t9,0x0($a2) /* f1a6e60: 0019c0c0 */ sll $t8,$t9,0x3 /* f1a6e64: 03b82021 */ addu $a0,$sp,$t8 -/* f1a6e68: 0fc5b9f1 */ jal textGet +/* f1a6e68: 0fc5b9f1 */ jal langGet /* f1a6e6c: 9484002c */ lhu $a0,0x2c($a0) /* f1a6e70: 10000009 */ beqz $zero,.L0f1a6e98 /* f1a6e74: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/lang.c b/src/game/lang.c new file mode 100644 index 000000000..96fc0589e --- /dev/null +++ b/src/game/lang.c @@ -0,0 +1,357 @@ +#include +#include "constants.h" +#include "gvars/gvars.h" +#include "game/data/data_000000.h" +#include "game/data/data_0083d0.h" +#include "game/data/data_0160b0.h" +#include "game/data/data_020df0.h" +#include "types.h" +#include "game/game_0b28d0.h" +#include "game/game_0f09f0.h" +#include "game/game_129900.h" +#include "game/game_1668e0.h" +#include "game/game_176080.h" +#include "game/lang.h" + +u32 langGetLangBankIndexFromStagenum(s32 stagenum) +{ + u32 index; + + switch (stagenum) { + case STAGE_PELAGIC: index = 0x0b; break; + case STAGE_EXTRACTION: index = 0x03; break; + case STAGE_TEST_RUN: index = 0x1c; break; + case STAGE_24: index = 0x1f; break; + case STAGE_MAIANSOS: index = 0x1e; break; + case STAGE_TEST_DEST: index = 0x0d; break; + case STAGE_2B: index = 0x20; break; + case STAGE_RETAKING: index = 0x1d; break; + case STAGE_WAR: index = 0x23; break; + case STAGE_CHICAGO: index = 0x19; break; + case STAGE_G5BUILDING: index = 0x0c; break; + case STAGE_ESCAPE: index = 0x24; break; + case STAGE_MP_TEMPLE: index = 0x12; break; + case STAGE_MP_PIPES: index = 0x09; break; + case STAGE_MP_G5BUILDING: index = 0x0a; break; + case STAGE_CITRAINING: index = 0x0e; break; + case STAGE_MP_COMPLEX: index = 0x1a; break; + case STAGE_MP_SKEDAR: index = 0x17; break; + case STAGE_TEST_LEN: index = 0x14; break; + case STAGE_DEFECTION: index = 0x01; break; + case STAGE_VILLA: index = 0x10; break; + case STAGE_DEFENSE: index = 0x11; break; + case STAGE_TEST_ASH: index = 0x04; break; + case STAGE_INVESTIGATION: index = 0x0f; break; + case STAGE_ATTACKSHIP: index = 0x13; break; + case STAGE_RESCUE: index = 0x15; break; + case STAGE_INFILTRATION: index = 0x16; break; + case STAGE_28: index = 0x0b; break; + case STAGE_DEEPSEA: index = 0x18; break; + case STAGE_SKEDARRUINS: index = 0x21; break; + case STAGE_AIRFORCEONE: index = 0x1b; break; + case STAGE_TEST_ARCH: index = 0x02; break; + case STAGE_MP_RAVINE: index = 0x08; break; + case STAGE_CRASHSITE: index = 0x05; break; + case STAGE_AIRBASE: index = 0x07; break; + case STAGE_TEST_UFF: index = 0x2d; break; + case STAGE_TEST_OLD: index = 0x2e; break; + case STAGE_DUEL: index = 0x2f; break; + case STAGE_TEST_LAM: index = 0x30; break; + case STAGE_MP_BASE: index = 0x31; break; + case STAGE_TEST_MP2: index = 0x32; break; + case STAGE_MP_AREA52: index = 0x33; break; + case STAGE_MP_WAREHOUSE: index = 0x34; break; + case STAGE_MP_CARPARK: index = 0x35; break; + case STAGE_TEST_MP6: index = 0x36; break; + case STAGE_TEST_MP7: index = 0x37; break; + case STAGE_TEST_MP8: index = 0x38; break; + case STAGE_MP_RUINS: index = 0x39; break; + case STAGE_MP_SEWERS: index = 0x3a; break; + case STAGE_MP_FELICITY: index = 0x3b; break; + case STAGE_MP_FORTRESS: index = 0x3c; break; + case STAGE_MP_VILLA: index = 0x3d; break; + case STAGE_TEST_MP14: index = 0x3e; break; + case STAGE_MP_GRID: index = 0x3f; break; + case STAGE_TEST_MP16: index = 0x40; break; + case STAGE_TEST_MP17: index = 0x41; break; + case STAGE_TEST_MP18: index = 0x42; break; + case STAGE_TEST_MP19: index = 0x43; break; + case STAGE_TEST_MP20: index = 0x44; break; + case STAGE_MBR: index = 0x25; break; + case STAGE_TEST_SILO: index = 0x22; break; + default: + while (true) { + // empty + } + } + + return index; +} + +GLOBAL_ASM( +glabel func0f16e3fc +/* f16e3fc: 27bdffc8 */ addiu $sp,$sp,-56 +/* f16e400: afb00018 */ sw $s0,0x18($sp) +/* f16e404: 308e2000 */ andi $t6,$a0,0x2000 +/* f16e408: 00808025 */ or $s0,$a0,$zero +/* f16e40c: afbf001c */ sw $ra,0x1c($sp) +/* f16e410: 240affff */ addiu $t2,$zero,-1 +/* f16e414: 240bffff */ addiu $t3,$zero,-1 +/* f16e418: 11c00002 */ beqz $t6,.L0f16e424 +/* f16e41c: 00004025 */ or $t0,$zero,$zero +/* f16e420: 24080001 */ addiu $t0,$zero,0x1 +.L0f16e424: +/* f16e424: 3c0c800b */ lui $t4,0x800b +/* f16e428: 8d8cabb8 */ lw $t4,-0x5448($t4) +/* f16e42c: 00002825 */ or $a1,$zero,$zero +/* f16e430: 00003825 */ or $a3,$zero,$zero +/* f16e434: 2409007c */ addiu $t1,$zero,0x7c +/* f16e438: 01802025 */ or $a0,$t4,$zero +.L0f16e43c: +/* f16e43c: 15000006 */ bnez $t0,.L0f16e458 +/* f16e440: 00000000 */ sll $zero,$zero,0x0 +/* f16e444: 94980000 */ lhu $t8,0x0($a0) +/* f16e448: 00107843 */ sra $t7,$s0,0x1 +/* f16e44c: 33193fff */ andi $t9,$t8,0x3fff +/* f16e450: 51f9001f */ beql $t7,$t9,.L0f16e4d0 +/* f16e454: 28a1007c */ slti $at,$a1,0x7c +.L0f16e458: +/* f16e458: 1100000b */ beqz $t0,.L0f16e488 +/* f16e45c: 94830000 */ lhu $v1,0x0($a0) +/* f16e460: 24ae0001 */ addiu $t6,$a1,0x1 +/* f16e464: 29c1007c */ slti $at,$t6,0x7c +/* f16e468: 10200007 */ beqz $at,.L0f16e488 +/* f16e46c: 00101043 */ sra $v0,$s0,0x1 +/* f16e470: 30783fff */ andi $t8,$v1,0x3fff +/* f16e474: 54580005 */ bnel $v0,$t8,.L0f16e48c +/* f16e478: 00031382 */ srl $v0,$v1,0xe +/* f16e47c: 948f0002 */ lhu $t7,0x2($a0) +/* f16e480: 31f93fff */ andi $t9,$t7,0x3fff +/* f16e484: 10590011 */ beq $v0,$t9,.L0f16e4cc +.L0f16e488: +/* f16e488: 00031382 */ srl $v0,$v1,0xe +.L0f16e48c: +/* f16e48c: 14400002 */ bnez $v0,.L0f16e498 +/* f16e490: 24a60001 */ addiu $a2,$a1,0x1 +/* f16e494: 00a05025 */ or $t2,$a1,$zero +.L0f16e498: +/* f16e498: 14400009 */ bnez $v0,.L0f16e4c0 +/* f16e49c: 24e70002 */ addiu $a3,$a3,0x2 +/* f16e4a0: 948e0002 */ lhu $t6,0x2($a0) +/* f16e4a4: 28c1007c */ slti $at,$a2,0x7c +/* f16e4a8: 000ec382 */ srl $t8,$t6,0xe +/* f16e4ac: 57000005 */ bnezl $t8,.L0f16e4c4 +/* f16e4b0: 00c02825 */ or $a1,$a2,$zero +/* f16e4b4: 50200003 */ beqzl $at,.L0f16e4c4 +/* f16e4b8: 00c02825 */ or $a1,$a2,$zero +/* f16e4bc: 00a05825 */ or $t3,$a1,$zero +.L0f16e4c0: +/* f16e4c0: 00c02825 */ or $a1,$a2,$zero +.L0f16e4c4: +/* f16e4c4: 14c9ffdd */ bne $a2,$t1,.L0f16e43c +/* f16e4c8: 24840002 */ addiu $a0,$a0,0x2 +.L0f16e4cc: +/* f16e4cc: 28a1007c */ slti $at,$a1,0x7c +.L0f16e4d0: +/* f16e4d0: 10200021 */ beqz $at,.L0f16e558 +/* f16e4d4: 00000000 */ sll $zero,$zero,0x0 +/* f16e4d8: 1500000c */ bnez $t0,.L0f16e50c +/* f16e4dc: 240d0060 */ addiu $t5,$zero,0x60 +/* f16e4e0: 00ad0019 */ multu $a1,$t5 +/* f16e4e4: 908f0000 */ lbu $t7,0x0($a0) +/* f16e4e8: 31f9ff3f */ andi $t9,$t7,0xff3f +/* f16e4ec: 372e0080 */ ori $t6,$t9,0x80 +/* f16e4f0: a08e0000 */ sb $t6,0x0($a0) +/* f16e4f4: 3c0f800b */ lui $t7,0x800b +/* f16e4f8: 8defabb4 */ lw $t7,-0x544c($t7) +/* f16e4fc: 0000c012 */ mflo $t8 +/* f16e500: 030f1021 */ addu $v0,$t8,$t7 +/* f16e504: 1000006f */ beqz $zero,.L0f16e6c4 +/* f16e508: 8fbf001c */ lw $ra,0x1c($sp) +.L0f16e50c: +/* f16e50c: 90990000 */ lbu $t9,0x0($a0) +/* f16e510: 3c09800b */ lui $t1,%hi(var800aabb8) +/* f16e514: 2529abb8 */ addiu $t1,$t1,%lo(var800aabb8) +/* f16e518: 332eff3f */ andi $t6,$t9,0xff3f +/* f16e51c: 35d80080 */ ori $t8,$t6,0x80 +/* f16e520: a0980000 */ sb $t8,0x0($a0) +/* f16e524: 8d2f0000 */ lw $t7,0x0($t1) +/* f16e528: 240d0060 */ addiu $t5,$zero,0x60 +/* f16e52c: 00ad0019 */ multu $a1,$t5 +/* f16e530: 01e72021 */ addu $a0,$t7,$a3 +/* f16e534: 90990002 */ lbu $t9,0x2($a0) +/* f16e538: 332eff3f */ andi $t6,$t9,0xff3f +/* f16e53c: 35d80080 */ ori $t8,$t6,0x80 +/* f16e540: a0980002 */ sb $t8,0x2($a0) +/* f16e544: 3c19800b */ lui $t9,0x800b +/* f16e548: 8f39abb4 */ lw $t9,-0x544c($t9) +/* f16e54c: 00007812 */ mflo $t7 +/* f16e550: 1000005b */ beqz $zero,.L0f16e6c0 +/* f16e554: 01f91021 */ addu $v0,$t7,$t9 +.L0f16e558: +/* f16e558: 15000025 */ bnez $t0,.L0f16e5f0 +/* f16e55c: 00000000 */ sll $zero,$zero,0x0 +/* f16e560: 05400023 */ bltz $t2,.L0f16e5f0 +/* f16e564: 240d0060 */ addiu $t5,$zero,0x60 +/* f16e568: 014d0019 */ multu $t2,$t5 +/* f16e56c: 000a3840 */ sll $a3,$t2,0x1 +/* f16e570: 01871821 */ addu $v1,$t4,$a3 +/* f16e574: 906e0000 */ lbu $t6,0x0($v1) +/* f16e578: 3c09800b */ lui $t1,%hi(var800aabb8) +/* f16e57c: 2529abb8 */ addiu $t1,$t1,%lo(var800aabb8) +/* f16e580: 31d8ff3f */ andi $t8,$t6,0xff3f +/* f16e584: 370f0080 */ ori $t7,$t8,0x80 +/* f16e588: a06f0000 */ sb $t7,0x0($v1) +/* f16e58c: 8d390000 */ lw $t9,0x0($t1) +/* f16e590: 00004012 */ mflo $t0 +/* f16e594: 00101043 */ sra $v0,$s0,0x1 +/* f16e598: 03271821 */ addu $v1,$t9,$a3 +/* f16e59c: 004d0019 */ multu $v0,$t5 +/* f16e5a0: 946f0000 */ lhu $t7,0x0($v1) +/* f16e5a4: 30583fff */ andi $t8,$v0,0x3fff +/* f16e5a8: 24060060 */ addiu $a2,$zero,0x60 +/* f16e5ac: 31f9c000 */ andi $t9,$t7,0xc000 +/* f16e5b0: 03197025 */ or $t6,$t8,$t9 +/* f16e5b4: a46e0000 */ sh $t6,0x0($v1) +/* f16e5b8: 3c0f800b */ lui $t7,0x800b +/* f16e5bc: 8defabb4 */ lw $t7,-0x544c($t7) +/* f16e5c0: 3c190019 */ lui $t9,0x19 +/* f16e5c4: 27394440 */ addiu $t9,$t9,0x4440 +/* f16e5c8: 0000c012 */ mflo $t8 +/* f16e5cc: 03192821 */ addu $a1,$t8,$t9 +/* f16e5d0: afa80024 */ sw $t0,0x24($sp) +/* f16e5d4: 0c003504 */ jal func0000d410 +/* f16e5d8: 010f2021 */ addu $a0,$t0,$t7 +/* f16e5dc: 3c0e800b */ lui $t6,0x800b +/* f16e5e0: 8fa80024 */ lw $t0,0x24($sp) +/* f16e5e4: 8dceabb4 */ lw $t6,-0x544c($t6) +/* f16e5e8: 10000035 */ beqz $zero,.L0f16e6c0 +/* f16e5ec: 010e1021 */ addu $v0,$t0,$t6 +.L0f16e5f0: +/* f16e5f0: 11000032 */ beqz $t0,.L0f16e6bc +/* f16e5f4: 3c02800b */ lui $v0,0x800b +/* f16e5f8: 05600030 */ bltz $t3,.L0f16e6bc +/* f16e5fc: 000b1840 */ sll $v1,$t3,0x1 +/* f16e600: 01831021 */ addu $v0,$t4,$v1 +/* f16e604: 904f0000 */ lbu $t7,0x0($v0) +/* f16e608: 3c09800b */ lui $t1,%hi(var800aabb8) +/* f16e60c: 2529abb8 */ addiu $t1,$t1,%lo(var800aabb8) +/* f16e610: 31f8ff3f */ andi $t8,$t7,0xff3f +/* f16e614: 37190080 */ ori $t9,$t8,0x80 +/* f16e618: a0590000 */ sb $t9,0x0($v0) +/* f16e61c: 8d2e0000 */ lw $t6,0x0($t1) +/* f16e620: 240d0060 */ addiu $t5,$zero,0x60 +/* f16e624: 016d0019 */ multu $t3,$t5 +/* f16e628: 01c31021 */ addu $v0,$t6,$v1 +/* f16e62c: 904f0002 */ lbu $t7,0x2($v0) +/* f16e630: 24060080 */ addiu $a2,$zero,0x80 +/* f16e634: 31f8ff3f */ andi $t8,$t7,0xff3f +/* f16e638: 37190080 */ ori $t9,$t8,0x80 +/* f16e63c: a0590002 */ sb $t9,0x2($v0) +/* f16e640: 8d2e0000 */ lw $t6,0x0($t1) +/* f16e644: 00107843 */ sra $t7,$s0,0x1 +/* f16e648: 31e73fff */ andi $a3,$t7,0x3fff +/* f16e64c: 01c31021 */ addu $v0,$t6,$v1 +/* f16e650: 94590000 */ lhu $t9,0x0($v0) +/* f16e654: 00004012 */ mflo $t0 +/* f16e658: 332ec000 */ andi $t6,$t9,0xc000 +/* f16e65c: 00ee7825 */ or $t7,$a3,$t6 +/* f16e660: a44f0000 */ sh $t7,0x0($v0) +/* f16e664: 8d380000 */ lw $t8,0x0($t1) +/* f16e668: 03031021 */ addu $v0,$t8,$v1 +/* f16e66c: 94590002 */ lhu $t9,0x2($v0) +/* f16e670: 3c18800b */ lui $t8,0x800b +/* f16e674: 332ec000 */ andi $t6,$t9,0xc000 +/* f16e678: 00ee7825 */ or $t7,$a3,$t6 +/* f16e67c: a44f0002 */ sh $t7,0x2($v0) +/* f16e680: 8f18abb4 */ lw $t8,-0x544c($t8) +/* f16e684: 32191fff */ andi $t9,$s0,0x1fff +/* f16e688: 00197043 */ sra $t6,$t9,0x1 +/* f16e68c: 01182021 */ addu $a0,$t0,$t8 +/* f16e690: 3c18001a */ lui $t8,0x1a +/* f16e694: 2718fb40 */ addiu $t8,$t8,-1216 +/* f16e698: 000e79c0 */ sll $t7,$t6,0x7 +/* f16e69c: 01f82821 */ addu $a1,$t7,$t8 +/* f16e6a0: 0c003504 */ jal func0000d410 +/* f16e6a4: afa80024 */ sw $t0,0x24($sp) +/* f16e6a8: 3c19800b */ lui $t9,0x800b +/* f16e6ac: 8fa80024 */ lw $t0,0x24($sp) +/* f16e6b0: 8f39abb4 */ lw $t9,-0x544c($t9) +/* f16e6b4: 10000002 */ beqz $zero,.L0f16e6c0 +/* f16e6b8: 01191021 */ addu $v0,$t0,$t9 +.L0f16e6bc: +/* f16e6bc: 8c42abb4 */ lw $v0,-0x544c($v0) +.L0f16e6c0: +/* f16e6c0: 8fbf001c */ lw $ra,0x1c($sp) +.L0f16e6c4: +/* f16e6c4: 8fb00018 */ lw $s0,0x18($sp) +/* f16e6c8: 27bd0038 */ addiu $sp,$sp,0x38 +/* f16e6cc: 03e00008 */ jr $ra +/* f16e6d0: 00000000 */ sll $zero,$zero,0x0 +); + +/** + * NTSC only supports English, while PAL supports 4 languages and JAP has its + * own. Each English file is followed immediately by the other translations. + * + * As it stands in the NTSC version, g_LanguageId is a flag that controls + * whether it uses English or Japanese text. This decomp is NTSC, so that's what + * you see here. + * + * For PAL, I suspect this function was adjusted to return values other than + * 0 and 1. + */ +s32 langGetLanguageId(void) +{ + s32 ret = 0; + + if (g_LanguageId != 0) { + ret = 1; + } + + return ret; +} + +s32 langGetFileId(s32 bank) +{ + return g_LangFiles[bank] + langGetLanguageId(); +} + +void langSetBankSimple(s32 bank) +{ + s32 file_id = langGetFileId(bank); + g_LangBanks[bank] = func0f1670fc(file_id, 0x22); +} + +void langSetBank(s32 bank, s32 arg1, s32 arg2) +{ + s32 file_id = langGetFileId(bank); + g_LangBanks[bank] = func0f167200(file_id, 0x22, arg1, arg2); +} + +void langClearBank(s32 bank) +{ + g_LangBanks[bank] = NULL; +} + +GLOBAL_ASM( +glabel langGet +/* f16e7c4: 00047243 */ sra $t6,$a0,0x9 +/* f16e7c8: 000e7880 */ sll $t7,$t6,0x2 +/* f16e7cc: 3c02800b */ lui $v0,0x800b +/* f16e7d0: 004f1021 */ addu $v0,$v0,$t7 +/* f16e7d4: 8c42aaa0 */ lw $v0,-0x5560($v0) +/* f16e7d8: 309801ff */ andi $t8,$a0,0x1ff +/* f16e7dc: 0018c880 */ sll $t9,$t8,0x2 +/* f16e7e0: 10400006 */ beqz $v0,.L0f16e7fc +/* f16e7e4: 00594021 */ addu $t0,$v0,$t9 +/* f16e7e8: 8d050000 */ lw $a1,0x0($t0) +/* f16e7ec: 10a00003 */ beqz $a1,.L0f16e7fc +/* f16e7f0: 00a21821 */ addu $v1,$a1,$v0 +/* f16e7f4: 03e00008 */ jr $ra +/* f16e7f8: 00601025 */ or $v0,$v1,$zero +.L0f16e7fc: +/* f16e7fc: 00001825 */ or $v1,$zero,$zero +/* f16e800: 03e00008 */ jr $ra +/* f16e804: 00601025 */ or $v0,$v1,$zero +); diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 3759a7b7a..b91222b44 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -28045,7 +28045,7 @@ u32 var800aaa90 = 0; u32 var800aaa94 = 0; u32 var800aaa98 = 0; u32 var800aaa9c = 0; -char *g_TextBanks[] = {0}; // length unsure - there are checks for index < 0x5a but length seems to be smaller +char *g_LangBanks[] = {0}; // length unsure - there are checks for index < 0x5a but length seems to be smaller u32 var800aaaa4 = 0; u32 var800aaaa8 = 0; u32 var800aaaac = 0; diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index 8264cfdc1..ea8ca749d 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -231,7 +231,7 @@ extern u32 var800840f0; extern u32 var800840f4; extern u32 var800840fc; extern u32 g_LanguageId; -extern u16 g_LangBanks[]; +extern u16 g_LangFiles[]; extern u32 var800841b8; extern u32 var80084220; extern struct something *somethings[]; diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index b2827df70..5333e8bb0 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -40,13 +40,5 @@ u32 audioRestartAuxTrack(void); void audioPlayXTrack(u32 arg0, u32 arg1, u32 arg2); u32 audioStopTrack(u32 arg0); u32 func0f16e138(void); -u32 textGetLangBankIndexFromStagenum(s32 stagenum); -u32 func0f16e3fc(void); -s32 textGetLanguageId(void); -s32 textGetFileId(s32 bank); -void textSetBankSimple(s32 bank); -void textSetBank(s32 bank, s32 arg1, s32 arg2); -void textClearBank(s32 bank); -char *textGet(s32 textid); #endif diff --git a/src/include/game/lang.h b/src/include/game/lang.h new file mode 100644 index 000000000..421589cf9 --- /dev/null +++ b/src/include/game/lang.h @@ -0,0 +1,15 @@ +#ifndef IN_GAME_LANG_H +#define IN_GAME_LANG_H +#include +#include "types.h" + +u32 langGetLangBankIndexFromStagenum(s32 stagenum); +u32 func0f16e3fc(void); +s32 langGetLanguageId(void); +s32 langGetFileId(s32 bank); +void langSetBankSimple(s32 bank); +void langSetBank(s32 bank, s32 arg1, s32 arg2); +void langClearBank(s32 bank); +char *langGet(s32 textid); + +#endif diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index c161b3534..acd69cbd7 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -811,7 +811,7 @@ extern u32 var800aaa68; extern u32 var800aaa78; extern u32 var800aaa88; extern u32 var800aaa98; -extern char *g_TextBanks[]; +extern char *g_LangBanks[]; extern u32 var800aabb4; extern u32 var800aabb8; extern u32 var800aabc0;