diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 72a9a0d9c..3a304a1fc 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1855,7 +1855,7 @@ s32 textGetLanguageId(void) s32 textGetFileId(s32 bank) { - return langtable[bank] + textGetLanguageId(); + return g_LangBanks[bank] + textGetLanguageId(); } void textSetBankSimple(s32 bank) diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h index a095158b4..b416a6f31 100644 --- a/src/include/setup/setup_020df0.h +++ b/src/include/setup/setup_020df0.h @@ -231,7 +231,7 @@ extern u32 var800840f0; extern u32 var800840f4; extern u32 var800840fc; extern u32 g_LanguageId; -extern u16 langtable[]; +extern u16 g_LangBanks[]; extern u32 var800841b8; extern u32 var80084220; extern struct something *somethings[]; diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 8dcd475b8..affdb029d 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -9652,25 +9652,76 @@ u32 var8008411c = 0x00000000; u32 g_LanguageId = 0; // 2a144 -u16 langtable[] = { - /*0x00*/ 0x0000, /*0x01*/ 0x0570, /*0x02*/ 0x0577, /*0x03*/ 0x0585, - /*0x04*/ 0x058c, /*0x05*/ 0x059a, /*0x06*/ 0x05a1, /*0x07*/ 0x05a8, - /*0x08*/ 0x057e, /*0x09*/ 0x05af, /*0x0a*/ 0x05b6, /*0x0b*/ 0x05bd, - /*0x0c*/ 0x05c4, /*0x0d*/ 0x05cb, /*0x0e*/ 0x05d2, /*0x0f*/ 0x05d9, - /*0x10*/ 0x05e0, /*0x11*/ 0x05ee, /*0x12*/ 0x05f5, /*0x13*/ 0x0603, - /*0x14*/ 0x060a, /*0x15*/ 0x0611, /*0x16*/ 0x0618, /*0x17*/ 0x06c0, - /*0x18*/ 0x06d5, /*0x19*/ 0x06dc, /*0x1a*/ 0x06ea, /*0x1b*/ 0x06f1, - /*0x1c*/ 0x06f8, /*0x1d*/ 0x0706, /*0x1e*/ 0x06ff, /*0x1f*/ 0x070d, - /*0x20*/ 0x0714, /*0x21*/ 0x071b, /*0x22*/ 0x0722, /*0x23*/ 0x0729, - /*0x24*/ 0x0737, /*0x25*/ 0x0745, /*0x26*/ 0x05e7, /*0x27*/ 0x0730, - /*0x28*/ 0x06b2, /*0x29*/ 0x06e3, /*0x2a*/ 0x06b9, /*0x2b*/ 0x06ce, - /*0x2c*/ 0x061f, /*0x2d*/ 0x073e, /*0x2e*/ 0x06c7, /*0x2f*/ 0x0593, - /*0x30*/ 0x05fc, /*0x31*/ 0x066c, /*0x32*/ 0x067a, /*0x33*/ 0x0681, - /*0x34*/ 0x0688, /*0x35*/ 0x068f, /*0x36*/ 0x0696, /*0x37*/ 0x069d, - /*0x38*/ 0x06a4, /*0x39*/ 0x06ab, /*0x3a*/ 0x0626, /*0x3b*/ 0x062d, - /*0x3c*/ 0x0634, /*0x3d*/ 0x063b, /*0x3e*/ 0x0642, /*0x3f*/ 0x0649, - /*0x40*/ 0x0650, /*0x41*/ 0x0657, /*0x42*/ 0x065e, /*0x43*/ 0x0665, - /*0x44*/ 0x0673, /*0x45*/ 0x0000, +u16 g_LangBanks[] = { + /*0x00*/ 0x0000, + /*0x01*/ 0x0570, // 02xx - ame + /*0x02*/ 0x0577, // 04xx - arch + /*0x03*/ 0x0585, // 06xx - ark + /*0x04*/ 0x058c, // 08xx - ash + /*0x05*/ 0x059a, // 0axx - azt + /*0x06*/ 0x05a1, // 0cxx - cat + /*0x07*/ 0x05a8, // 0exx - cave + /*0x08*/ 0x057e, // 10xx - arec + /*0x09*/ 0x05af, // 12xx - crad + /*0x0a*/ 0x05b6, // 14xx - cryp + /*0x0b*/ 0x05bd, // 16xx - dam + /*0x0c*/ 0x05c4, // 18xx - depo + /*0x0d*/ 0x05cb, // 1axx - dest + /*0x0e*/ 0x05d2, // 1cxx - dish + /*0x0f*/ 0x05d9, // 1exx - ear + /*0x10*/ 0x05e0, // 20xx - eld + /*0x11*/ 0x05ee, // 22xx - imp + /*0x12*/ 0x05f5, // 24xx - jun + /*0x13*/ 0x0603, // 26xx - lee + /*0x14*/ 0x060a, // 28xx - len + /*0x15*/ 0x0611, // 2axx - lip + /*0x16*/ 0x0618, // 2cxx - lue + /*0x17*/ 0x06c0, // 2exx - oat + /*0x18*/ 0x06d5, // 30xx - pam + /*0x19*/ 0x06dc, // 32xx - pete + /*0x1a*/ 0x06ea, // 34xx - ref + /*0x1b*/ 0x06f1, // 36xx - rit + /*0x1c*/ 0x06f8, // 38xx - run + /*0x1d*/ 0x0706, // 3axx - sevb + /*0x1e*/ 0x06ff, // 3cxx - sev + /*0x1f*/ 0x070d, // 3exx - sevx + /*0x20*/ 0x0714, // 40xx - sevxb + /*0x21*/ 0x071b, // 42xx - sho + /*0x22*/ 0x0722, // 44xx - silo + /*0x23*/ 0x0729, // 46xx - stat + /*0x24*/ 0x0737, // 48xx - tra + /*0x25*/ 0x0745, // 4axx - wax + /*0x26*/ 0x05e7, // 4cxx - gun + /*0x27*/ 0x0730, // 4exx - title + /*0x28*/ 0x06b2, // 50xx - mpmenu + /*0x29*/ 0x06e3, // 52xx - propobj + /*0x2a*/ 0x06b9, // 54xx - mpweapons + /*0x2b*/ 0x06ce, // 56xx - options + /*0x2c*/ 0x061f, // 58xx - misc + /*0x2d*/ 0x073e, // 5axx - uff + /*0x2e*/ 0x06c7, // 5cxx - old + /*0x2f*/ 0x0593, // 5exx - ate + /*0x30*/ 0x05fc, // 60xx - lam + /*0x31*/ 0x066c, // 62xx - mp1 + /*0x32*/ 0x067a, // 64xx - mp2 + /*0x33*/ 0x0681, // 66xx - mp3 + /*0x34*/ 0x0688, // 68xx - mp4 + /*0x35*/ 0x068f, // 6axx - mp5 + /*0x36*/ 0x0696, // 6cxx - mp6 + /*0x37*/ 0x069d, // 6exx - mp7 + /*0x38*/ 0x06a4, // 70xx - mp8 + /*0x39*/ 0x06ab, // 72xx - mp9 + /*0x3a*/ 0x0626, // 74xx - mp10 + /*0x3b*/ 0x062d, // 76xx - mp11 + /*0x3c*/ 0x0634, // 78xx - mp12 + /*0x3d*/ 0x063b, // 7axx - mp13 + /*0x3e*/ 0x0642, // 7cxx - mp14 + /*0x3f*/ 0x0649, // 7exx - mp15 + /*0x40*/ 0x0650, // 80xx - mp16 + /*0x41*/ 0x0657, // 82xx - mp17 + /*0x42*/ 0x065e, // 84xx - mp18 + /*0x43*/ 0x0665, // 86xx - mp19 + /*0x44*/ 0x0673, // 88xx - mp20 }; u32 var800841b0 = 0x0006ddd0;