diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 33418245a..ab6dc0009 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -3000,7 +3000,7 @@ glabel func0f00eb64 /* f00ec44: 8fa40060 */ lw $a0,0x60($sp) /* f00ec48: 0fc5b878 */ jal func0f16e1e0 /* f00ec4c: afa20040 */ sw $v0,0x40($sp) -/* f00ec50: 0fc5b9ca */ jal func0f16e728 +/* f00ec50: 0fc5b9ca */ jal textSetBankSimple /* f00ec54: 00402025 */ or $a0,$v0,$zero /* f00ec58: 8fa90040 */ lw $t1,0x40($sp) /* f00ec5c: 3c07800a */ lui $a3,%hi(var8009d030) diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index ef4c4fa68..026d5127a 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1990,24 +1990,11 @@ glabel func0f16e6f4 /* f16e724: 00581021 */ addu $v0,$v0,$t8 ); -GLOBAL_ASM( -glabel func0f16e728 -/* f16e728: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16e72c: afbf0014 */ sw $ra,0x14($sp) -/* f16e730: 0fc5b9bd */ jal func0f16e6f4 -/* f16e734: afa40018 */ sw $a0,0x18($sp) -/* f16e738: 00402025 */ or $a0,$v0,$zero -/* f16e73c: 0fc59c3f */ jal func0f1670fc -/* f16e740: 24050022 */ addiu $a1,$zero,0x22 -/* f16e744: 8fae0018 */ lw $t6,0x18($sp) -/* f16e748: 8fbf0014 */ lw $ra,0x14($sp) -/* f16e74c: 3c01800b */ lui $at,0x800b -/* f16e750: 000e7880 */ sll $t7,$t6,0x2 -/* f16e754: 002f0821 */ addu $at,$at,$t7 -/* f16e758: ac22aaa0 */ sw $v0,-0x5560($at) -/* f16e75c: 03e00008 */ jr $ra -/* f16e760: 27bd0018 */ addiu $sp,$sp,0x18 -); +void textSetBankSimple(s32 bank) +{ + void *ptr = func0f16e6f4(bank); + g_TextBanks[bank] = func0f1670fc(ptr, 0x22); +} void textSetBank(s32 bank, s32 arg1, s32 arg2) { diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h index b7ef370f3..03412e099 100644 --- a/src/include/game/game_1668e0.h +++ b/src/include/game/game_1668e0.h @@ -22,7 +22,7 @@ u32 func0f166eb4(void); u32 func0f166f74(void); u32 func0f166ff0(void); u32 func0f167054(void); -u32 func0f1670fc(void); +char *func0f1670fc(void *ptr, s32 arg1); char *func0f167200(void *ptr, s32 arg1, s32 arg2, s32 arg3); u32 func0f167280(void); u32 func0f167294(void); diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index 0af7c70dc..7e2ecf921 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -44,7 +44,7 @@ u32 func0f16e1e0(s32 arg0); u32 func0f16e3fc(void); u32 func0f16e6d4(void); void *func0f16e6f4(s32 bank); -u32 func0f16e728(void); +void textSetBankSimple(s32 bank); void textSetBank(s32 bank, s32 arg1, s32 arg2); void textClearBank(s32 bank); u32 func0f16e818(void);