From 5df61485f97afffa6429c3b9f7140152b2fcfab9 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 16 Jul 2020 00:17:27 +1000 Subject: [PATCH] Decompile fileGetRomAddress --- src/game/game_166e40.c | 12 ++++-------- src/include/game/game_166e40.h | 2 +- src/lib/lib_0e9d0.c | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/game/game_166e40.c b/src/game/game_166e40.c index 664260043..8e034d319 100644 --- a/src/game/game_166e40.c +++ b/src/game/game_166e40.c @@ -32,14 +32,10 @@ const char var7f1b774c[] = "pos:%s%s %.2f %.2f %.2f\n"; const u32 var7f1b7768[] = {0x00000000}; const u32 var7f1b776c[] = {0x00000000}; -GLOBAL_ASM( -glabel func0f166e40 -/* f166e40: 00047080 */ sll $t6,$a0,0x2 -/* f166e44: 3c028008 */ lui $v0,%hi(filetable) -/* f166e48: 004e1021 */ addu $v0,$v0,$t6 -/* f166e4c: 03e00008 */ jr $ra -/* f166e50: 8c422060 */ lw $v0,%lo(filetable)($v0) -); +void *fileGetRomAddress(s32 filenum) +{ + return filetable[filenum]; +} u32 fileGetRomSizeByTableAddress(u32 *filetableaddr) { diff --git a/src/include/game/game_166e40.h b/src/include/game/game_166e40.h index e8480168a..a6fb4fde7 100644 --- a/src/include/game/game_166e40.h +++ b/src/include/game/game_166e40.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f166e40(void); +void *fileGetRomAddress(s32 filenum); u32 fileGetRomSizeByTableAddress(u32 *filetableaddr); u32 fileGetRomSizeByFileNum(s32 filenum); u32 func0f166ea8(void); diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index 3c17dd767..7cd1d474b 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -2617,7 +2617,7 @@ glabel func00010ae4 /* 10ca4: 01c1001a */ div $zero,$t6,$at /* 10ca8: 00004812 */ mflo $t1 /* 10cac: afa9002c */ sw $t1,0x2c($sp) -/* 10cb0: 0fc59b90 */ jal func0f166e40 +/* 10cb0: 0fc59b90 */ jal fileGetRomAddress /* 10cb4: 00000000 */ nop /* 10cb8: 97a40020 */ lhu $a0,0x20($sp) /* 10cbc: ae02001c */ sw $v0,0x1c($s0)