falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile proutSprintf

This commit is contained in:
Ryan Dwyer 2021-01-30 15:03:39 +10:00
parent b779b1a648
commit 4e843fd58d
37 changed files with 38 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ld/libfiles.inc
View File

@ -33,7 +33,8 @@
build/ROMID/lib/memory.o (section); \
build/ROMID/lib/lib_126b0.o (section); \
build/ROMID/lib/lib_12dc0.o (section); \
build/ROMID/lib/lib_13130.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \
build/ROMID/lib/lib_13710.o (section); \
build/ROMID/lib/lib_13750.o (section); \
build/ROMID/lib/lib_13790.o (section); \

1
src/game/activemenu/activemenu.c
View File

@ -29,7 +29,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "lib/lib_16110.h"
#include "types.h"

1
src/game/activemenu/tick.c
View File

@ -16,7 +16,6 @@
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/controller.h"
#include "lib/lib_13130.h"
#include "types.h"
void amTick(void)

1
src/game/bondeyespy.c
View File

@ -24,7 +24,6 @@
#include "gvars/gvars.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_13130.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "types.h"

1
src/game/bondview.c
View File

@ -21,7 +21,6 @@
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_16110.h"
#include "types.h"
#include "gbiex.h"

1
src/game/cheats.c
View File

@ -16,7 +16,6 @@
#include "game/lang.h"
#include "game/pak/pak.h"
#include "gvars/gvars.h"
#include "lib/lib_13130.h"
#include "types.h"
struct cheat g_Cheats[NUM_CHEATS] = {

1
src/game/endscreen.c
View File

@ -32,7 +32,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "types.h"
s32 menuhandlerDeclineMission(u32 operation, struct menuitem *item, union handlerdata *data)

1
src/game/game_01b0a0.c
View File

@ -14,7 +14,6 @@
#include "game/game_127910.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_13130.h"
#include "types.h"
f32 pdmodeGetReaction(void)

1
src/game/game_095320.c
View File

@ -24,7 +24,6 @@
#include "lib/lib_0d0a0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "types.h"

1
src/game/game_097ba0.c
View File

@ -48,7 +48,6 @@
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

1
src/game/game_0b0fd0.c
View File

@ -20,7 +20,6 @@
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_13130.h"
#include "types.h"
struct weapon *weaponFindById(s32 itemid)

1
src/game/game_0d4690.c
View File

@ -14,7 +14,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

1
src/game/game_0dcdb0.c
View File

@ -24,7 +24,6 @@
#include "lib/lib_09660.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_13130.h"
#include "lib/lib_16110.h"
#include "types.h"

1
src/game/game_0f09f0.c
View File

@ -43,7 +43,6 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"

1
src/game/game_102240.c
View File

@ -36,7 +36,6 @@
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_13130.h"
#include "types.h"
char *menuTextCurrentStageName(struct menuitem *item)

1
src/game/game_107fb0.c
View File

@ -20,7 +20,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/lib_126b0.h"
#include "lib/lib_13130.h"
#include "types.h"
char *filemgrGetDeviceName(s32 index)

1
src/game/game_166e40.c
View File

@ -14,7 +14,6 @@
#include "lib/lib_0d0a0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "types.h"
void *fileGetRomAddress(s32 filenum)

1
src/game/game_1a7560.c
View File

@ -28,7 +28,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "types.h"
GLOBAL_ASM(

1
src/game/gamefile.c
View File

@ -24,7 +24,6 @@
#include "lib/lib_0bfb0.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_126b0.h"
#include "lib/lib_13130.h"
#include "lib/lib_4b170.h"
#include "types.h"

1
src/game/gfxmemory.c
View File

@ -14,7 +14,6 @@
#include "lib/lib_0d0a0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "types.h"
/**

1
src/game/menu/items.c
View File

@ -25,7 +25,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "types.h"
const char var7f1adfa0[] = "brcol";

1
src/game/mplayer/ingame.c
View File

@ -23,7 +23,6 @@
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "types.h"
const char var7f1b7e80[] = "";

1
src/game/mplayer/mplayer.c
View File

@ -31,7 +31,6 @@
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_317f0.h"
#include "types.h"

1
src/game/mplayer/options.c
View File

@ -37,7 +37,6 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

1
src/game/mplayer/scenarios.c
View File

@ -37,7 +37,6 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

1
src/game/mplayer/setup.c
View File

@ -24,7 +24,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "types.h"
s32 menuhandlerMpDropOut(u32 operation, struct menuitem *item, union handlerdata *data)

1
src/game/mpstats.c
View File

@ -20,7 +20,6 @@
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_13130.h"
#include "types.h"
void mpstatsIncrementPlayerShotCount(struct hand *hand, s32 region)

1
src/game/pak/pak.c
View File

@ -22,7 +22,6 @@
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_4cc10.h"
#include "lib/lib_4ce60.h"
#include "lib/lib_4d000.h"

1
src/game/propobj.c
View File

@ -72,7 +72,6 @@
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

1
src/game/training/menus.c
View File

@ -29,7 +29,6 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_13130.h"
#include "types.h"
s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data)

1
src/game/training/training.c
View File

@ -40,7 +40,6 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

5
src/include/lib/lib_13130.h → src/include/lib/str.h
View File

@ -1,5 +1,5 @@
#ifndef _IN_LIB_LIB_13130_H
#define _IN_LIB_LIB_13130_H
#ifndef _IN_LIB_STR_H
#define _IN_LIB_STR_H
#include <ultra64.h>
#include "types.h"
@ -13,6 +13,5 @@ s32 isdigit(char c);
s32 isalpha(char c);
s32 isspace(char c);
s32 func00013408(char *arg0, s32 *arg1, s32 arg2);
int sprintf(char *dest, const char *format, ...);
#endif

1
src/lib/lib_0e9d0.c
View File

@ -16,7 +16,6 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_2faf0.h"
#include "lib/lib_2fc60.h"
#include "lib/lib_317f0.h"

1
src/lib/lib_12dc0.c
View File

@ -9,7 +9,6 @@
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_2fa00.h"
#include "types.h"

1
src/lib/main.c
View File

@ -58,7 +58,6 @@
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13130.h"
#include "lib/lib_13750.h"
#include "lib/lib_13790.h"
#include "lib/lib_233c0.h"

52
src/lib/lib_13130.c → src/lib/str.c
View File

@ -1,16 +1,5 @@
#include <ultra64.h>
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/lib_0bfb0.h"
#include "lib/lib_13130.h"
#include "types.h"
char *strcpy(char *dst, char *src)
{
@ -342,44 +331,3 @@ glabel func00013408
/* 13688: 27bd0060 */ addiu $sp,$sp,0x60
/* 1368c: 00000000 */ nop
);
GLOBAL_ASM(
glabel proutSprintf
/* 13690: 27bdffe8 */ addiu $sp,$sp,-24
/* 13694: afbf0014 */ sw $ra,0x14($sp)
/* 13698: 0c012978 */ jal memcpy
/* 1369c: afa60020 */ sw $a2,0x20($sp)
/* 136a0: 8fbf0014 */ lw $ra,0x14($sp)
/* 136a4: 8fae0020 */ lw $t6,0x20($sp)
/* 136a8: 27bd0018 */ addiu $sp,$sp,0x18
/* 136ac: 03e00008 */ jr $ra
/* 136b0: 004e1021 */ addu $v0,$v0,$t6
);
GLOBAL_ASM(
glabel sprintf
/* 136b4: 27bdffe0 */ addiu $sp,$sp,-32
/* 136b8: afa40020 */ sw $a0,0x20($sp)
/* 136bc: afbf0014 */ sw $ra,0x14($sp)
/* 136c0: afa50024 */ sw $a1,0x24($sp)
/* 136c4: afa60028 */ sw $a2,0x28($sp)
/* 136c8: afa7002c */ sw $a3,0x2c($sp)
/* 136cc: 3c047001 */ lui $a0,%hi(proutSprintf)
/* 136d0: 24843690 */ addiu $a0,$a0,%lo(proutSprintf)
/* 136d4: 27a70028 */ addiu $a3,$sp,0x28
/* 136d8: 8fa60024 */ lw $a2,0x24($sp)
/* 136dc: 0c013b40 */ jal _Printf
/* 136e0: 8fa50020 */ lw $a1,0x20($sp)
/* 136e4: 04400004 */ bltz $v0,.L000136f8
/* 136e8: 00401825 */ or $v1,$v0,$zero
/* 136ec: 8fae0020 */ lw $t6,0x20($sp)
/* 136f0: 01c27821 */ addu $t7,$t6,$v0
/* 136f4: a1e00000 */ sb $zero,0x0($t7)
.L000136f8:
/* 136f8: 8fbf0014 */ lw $ra,0x14($sp)
/* 136fc: 27bd0020 */ addiu $sp,$sp,0x20
/* 13700: 03e00008 */ jr $ra
/* 13704: 00000000 */ nop
/* 13708: 00000000 */ nop
/* 1370c: 00000000 */ nop
);

34
src/lib/ultra/libc/sprintf.c Normal file
View File

@ -0,0 +1,34 @@
#include <ultra64.h>
char *proutSprintf(char *dst, const char *src, size_t count)
{
return (char *)memcpy((u8 *)dst, (u8 *)src, count) + count;
}
GLOBAL_ASM(
glabel sprintf
/* 136b4: 27bdffe0 */ addiu $sp,$sp,-32
/* 136b8: afa40020 */ sw $a0,0x20($sp)
/* 136bc: afbf0014 */ sw $ra,0x14($sp)
/* 136c0: afa50024 */ sw $a1,0x24($sp)
/* 136c4: afa60028 */ sw $a2,0x28($sp)
/* 136c8: afa7002c */ sw $a3,0x2c($sp)
/* 136cc: 3c047001 */ lui $a0,%hi(proutSprintf)
/* 136d0: 24843690 */ addiu $a0,$a0,%lo(proutSprintf)
/* 136d4: 27a70028 */ addiu $a3,$sp,0x28
/* 136d8: 8fa60024 */ lw $a2,0x24($sp)
/* 136dc: 0c013b40 */ jal _Printf
/* 136e0: 8fa50020 */ lw $a1,0x20($sp)
/* 136e4: 04400004 */ bltz $v0,.L000136f8
/* 136e8: 00401825 */ or $v1,$v0,$zero
/* 136ec: 8fae0020 */ lw $t6,0x20($sp)
/* 136f0: 01c27821 */ addu $t7,$t6,$v0
/* 136f4: a1e00000 */ sb $zero,0x0($t7)
.L000136f8:
/* 136f8: 8fbf0014 */ lw $ra,0x14($sp)
/* 136fc: 27bd0020 */ addiu $sp,$sp,0x20
/* 13700: 03e00008 */ jr $ra
/* 13704: 00000000 */ nop
/* 13708: 00000000 */ nop
/* 1370c: 00000000 */ nop
);