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

Split lib_12dc0.c into rng.c and args.c

This commit is contained in:
Ryan Dwyer 2021-01-30 19:42:22 +10:00
parent f262c23324
commit 36f092e775
67 changed files with 156 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ld/libfiles.inc
View File

@ -32,7 +32,8 @@
build/ROMID/lib/lib_11420.o (section); \
build/ROMID/lib/memory.o (section); \
build/ROMID/lib/lib_126b0.o (section); \
build/ROMID/lib/lib_12dc0.o (section); \
build/ROMID/lib/rng.o (section); \
build/ROMID/lib/args.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \
build/ROMID/lib/lib_13710.o (section); \

2
src/boot/entry.c
View File

@ -10,12 +10,12 @@
#include "game/data/data_02da90.h"
#include "game/game_0e0770.h"
#include "gvars/gvars.h"
#include "lib/args.h"
#include "lib/lib_074f0.h"
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13710.h"
#include "lib/lib_13750.h"
#include "lib/lib_2fa00.h"

2
src/boot/init.c
View File

@ -13,12 +13,12 @@
#include "game/data/data_02da90.h"
#include "game/game_0e0770.h"
#include "gvars/gvars.h"
#include "lib/args.h"
#include "lib/lib_074f0.h"
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13710.h"
#include "lib/lib_13750.h"
#include "lib/lib_2fa00.h"

2
src/boot/sched.c
View File

@ -11,13 +11,13 @@
#include "game/data/data_02da90.h"
#include "game/game_0e0770.h"
#include "gvars/gvars.h"
#include "lib/args.h"
#include "lib/audiomgr.h"
#include "lib/lib_074f0.h"
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13710.h"
#include "lib/lib_13750.h"
#include "lib/lib_2fa00.h"

2
src/game/bondhead.c
View File

@ -11,7 +11,7 @@
#include "game/game_096b20.h"
#include "game/bondhead.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_233c0.h"
#include "lib/model.h"

2
src/game/bondmove.c
View File

@ -34,7 +34,7 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/bondview.c
View File

@ -20,7 +20,7 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "types.h"
#include "gbiex.h"

2
src/game/bondwalk.c
View File

@ -25,7 +25,7 @@
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "types.h"

2
src/game/camdraw.c
View File

@ -20,7 +20,7 @@
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/libc/ll.h"
#include "types.h"

2
src/game/chr/chr.c
View File

@ -45,7 +45,7 @@
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/chr/chraction.c
View File

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

2
src/game/chr/chrai.c
View File

@ -12,7 +12,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/chr/chraicommands.c
View File

@ -51,7 +51,7 @@
#include "lib/model.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_11420.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

3
src/game/core.c
View File

@ -103,13 +103,14 @@
#include "game/utils.h"
#include "game/wallhit.h"
#include "gvars/gvars.h"
#include "lib/args.h"
#include "lib/controller.h"
#include "lib/lib_06440.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_11420.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "lib/lib_317f0.h"

2
src/game/credits.c
View File

@ -25,7 +25,7 @@
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/dlights.c
View File

@ -25,7 +25,7 @@
#include "gvars/gvars.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_2f490.h"
#include "lib/lib_317f0.h"

2
src/game/explosions/explosions.c
View File

@ -27,7 +27,7 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "types.h"

2
src/game/game_005fd0.c
View File

@ -11,7 +11,7 @@
#include "game/game_005fd0.h"
#include "game/game_092610.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/game_006bd0.c
View File

@ -22,7 +22,7 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"

2
src/game/game_00b820.c
View File

@ -15,7 +15,7 @@
#include "game/game_091e10.h"
#include "gvars/gvars.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
GLOBAL_ASM(

2
src/game/game_00c490.c
View File

@ -39,7 +39,7 @@
#include "gvars/gvars.h"
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/game_0147d0.c
View File

@ -15,7 +15,7 @@
#include "game/mplayer/mplayer.h"
#include "gvars/gvars.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/game_01d9f0.c
View File

@ -10,7 +10,7 @@
#include "game/game_01d9f0.h"
#include "gvars/gvars.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"
#include "types.h"

2
src/game/game_02cde0.c
View File

@ -22,7 +22,7 @@
#include "gvars/gvars.h"
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "types.h"

2
src/game/game_0601b0.c
View File

@ -35,7 +35,7 @@
#include "game/mpstats.h"
#include "gvars/gvars.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/game_092610.c
View File

@ -18,7 +18,7 @@
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"
#include "types.h"

2
src/game/game_095320.c
View File

@ -23,7 +23,7 @@
#include "gvars/gvars.h"
#include "lib/lib_0d0a0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "types.h"

2
src/game/game_096360.c
View File

@ -13,7 +13,7 @@
#include "game/training/training.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/game_097ba0.c
View File

@ -47,7 +47,7 @@
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/game_0abe70.c
View File

@ -16,7 +16,7 @@
#include "game/game_166e40.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/game_0b63b0.c
View File

@ -61,7 +61,7 @@
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/game_0b69d0.c
View File

@ -64,7 +64,7 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/game_0e0770.c
View File

@ -18,7 +18,7 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/game_0f09f0.c
View File

@ -42,7 +42,7 @@
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"

2
src/game/game_127910.c
View File

@ -14,7 +14,7 @@
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
const u32 var7f1b5150[] = {0xc3653838};

2
src/game/game_128f30.c
View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
GLOBAL_ASM(

2
src/game/game_129210.c
View File

@ -13,7 +13,7 @@
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_126b0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
/**

2
src/game/game_150820.c
View File

@ -14,7 +14,7 @@
#include "game/game_150820.h"
#include "game/game_166e40.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/game_157db0.c
View File

@ -39,7 +39,7 @@
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_2f490.h"

2
src/game/game_166e40.c
View File

@ -13,7 +13,7 @@
#include "lib/lib_074f0.h"
#include "lib/lib_0d0a0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
void *fileGetRomAddress(s32 filenum)

2
src/game/game_190260.c
View File

@ -33,7 +33,7 @@
#include "game/splat.h"
#include "gvars/gvars.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "types.h"

2
src/game/game_197600.c
View File

@ -20,7 +20,7 @@
#include "game/mplayer/mplayer.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
const u32 var7f1b8fd0[] = {0x48742400};

2
src/game/game_1999b0.c
View File

@ -19,7 +19,7 @@
#include "game/padhalllv.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/game_19aa80.c
View File

@ -22,7 +22,7 @@
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/lib_0d0a0.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
u32 g_MpChallengeIndex = 0;

2
src/game/gfxmemory.c
View File

@ -13,7 +13,7 @@
#include "lib/lib_074f0.h"
#include "lib/lib_0d0a0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "types.h"
/**

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

@ -28,9 +28,10 @@
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "gvars/gvars.h"
#include "lib/args.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_317f0.h"
#include "types.h"

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

@ -36,7 +36,7 @@
#include "lib/lib_09660.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

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

@ -36,7 +36,7 @@
#include "lib/lib_09660.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

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

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

2
src/game/padhalllv.c
View File

@ -12,7 +12,7 @@
#include "game/pad.h"
#include "game/padhalllv.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_233c0.h"
#include "lib/libc/ll.h"
#include "types.h"

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

@ -21,7 +21,7 @@
#include "lib/lib_06550.h"
#include "lib/main.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_4cc10.h"
#include "lib/lib_4ce60.h"
#include "lib/lib_4d000.h"

2
src/game/propobj.c
View File

@ -71,7 +71,7 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

2
src/game/sky.c
View File

@ -14,7 +14,7 @@
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/smoke/smoke.c
View File

@ -16,7 +16,7 @@
#include "game/game_166e40.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/sparks/sparks.c
View File

@ -14,7 +14,7 @@
#include "game/game_166e40.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "types.h"

2
src/game/splat.c
View File

@ -15,7 +15,7 @@
#include "game/wallhit.h"
#include "gvars/gvars.h"
#include "lib/model.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

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

@ -39,7 +39,7 @@
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/wallhit.c
View File

@ -19,7 +19,7 @@
#include "game/wallhit.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "types.h"

2
src/game/weather/weather.c
View File

@ -18,7 +18,7 @@
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"

2
src/include/game/data/data_000000.h
View File

@ -4,7 +4,7 @@
#include "types.h"
extern s32 g_StageNum;
extern u64 rand_seed;
extern u64 g_RngSeed;
extern struct chrdata *g_ChrSlots; // pointer to first element of chrs array
extern s32 g_NumChrSlots;

7
src/include/lib/lib_12dc0.h → src/include/lib/args.h
View File

@ -1,15 +1,12 @@
#ifndef _IN_LIB_LIB_12DC0_H
#define _IN_LIB_LIB_12DC0_H
#ifndef _IN_LIB_ARGS_H
#define _IN_LIB_ARGS_H
#include <ultra64.h>
#include "types.h"
void rngSetSeed(u32 amount);
u32 func00012e1c(u64 *value);
char *argParseString(char *str);
void argSetString(char *string);
s32 argsParseDebugArgs(void);
char *argFindByPrefix(s32 occurrence, char *string);
void argGetLevel(s32 *stagenum);
u32 random(void);
#endif

10
src/include/lib/rng.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef _IN_LIB_RNG_H
#define _IN_LIB_RNG_H
#include <ultra64.h>
#include "types.h"
u32 random(void);
void rngSetSeed(u32 seed);
u32 func00012e1c(u64 *value);
#endif

67
src/lib/lib_12dc0.c → src/lib/args.c
View File

@ -9,14 +9,10 @@
#include "game/data/data_02a0e0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/args.h"
#include "lib/lib_2fa00.h"
#include "types.h"
u64 rand_seed = 0xab8d9f7781280783;
u32 var8005ee08 = 0x00000000;
u32 var8005ee0c = 0x00000000;
s32 argc = 1;
char *argv[17] = {
@ -38,67 +34,6 @@ char *argv[17] = {
NULL,
};
GLOBAL_ASM(
glabel random
/* 12dc0: 3c048006 */ lui $a0,%hi(rand_seed)
/* 12dc4: dc84ee00 */ ld $a0,%lo(rand_seed)($a0)
/* 12dc8: 3c018006 */ lui $at,%hi(rand_seed)
/* 12dcc: 000437fc */ dsll32 $a2,$a0,0x1f
/* 12dd0: 00042ff8 */ dsll $a1,$a0,0x1f
/* 12dd4: 000637fa */ dsrl $a2,$a2,0x1f
/* 12dd8: 0005283e */ dsrl32 $a1,$a1,0x0
/* 12ddc: 0004233c */ dsll32 $a0,$a0,0xc
/* 12de0: 00c53025 */ or $a2,$a2,$a1
/* 12de4: 0004203e */ dsrl32 $a0,$a0,0x0
/* 12de8: 00c43026 */ xor $a2,$a2,$a0
/* 12dec: 0006253a */ dsrl $a0,$a2,0x14
/* 12df0: 30840fff */ andi $a0,$a0,0xfff
/* 12df4: 00862026 */ xor $a0,$a0,$a2
/* 12df8: 0004103c */ dsll32 $v0,$a0,0x0
/* 12dfc: fc24ee00 */ sd $a0,%lo(rand_seed)($at)
/* 12e00: 03e00008 */ jr $ra
/* 12e04: 0002103f */ dsra32 $v0,$v0,0x0
);
// Commented because ld isn't happy with bitshifting a u64.
//u32 random(void)
//{
// rand_seed = ((rand_seed << 63) >> 31 | (rand_seed << 31) >> 32) ^ (rand_seed << 44) >> 32;
// rand_seed = rand_seed >> 20 & 0xfff ^ rand_seed;
//
// return rand_seed;
//}
GLOBAL_ASM(
glabel rngSetSeed
/* 12e08: 64840001 */ daddiu $a0,$a0,0x1
/* 12e0c: 3c018006 */ lui $at,%hi(rand_seed)
/* 12e10: fc24ee00 */ sd $a0,%lo(rand_seed)($at)
/* 12e14: 03e00008 */ jr $ra
/* 12e18: 24040000 */ addiu $a0,$zero,0x0
);
GLOBAL_ASM(
glabel func00012e1c
/* 12e1c: dc870000 */ ld $a3,0x0($a0)
/* 12e20: 000737fc */ dsll32 $a2,$a3,0x1f
/* 12e24: 00072ff8 */ dsll $a1,$a3,0x1f
/* 12e28: 000637fa */ dsrl $a2,$a2,0x1f
/* 12e2c: 0005283e */ dsrl32 $a1,$a1,0x0
/* 12e30: 00073b3c */ dsll32 $a3,$a3,0xc
/* 12e34: 00c53025 */ or $a2,$a2,$a1
/* 12e38: 0007383e */ dsrl32 $a3,$a3,0x0
/* 12e3c: 00c73026 */ xor $a2,$a2,$a3
/* 12e40: 00063d3a */ dsrl $a3,$a2,0x14
/* 12e44: 30e70fff */ andi $a3,$a3,0xfff
/* 12e48: 00e63826 */ xor $a3,$a3,$a2
/* 12e4c: 0007103c */ dsll32 $v0,$a3,0x0
/* 12e50: fc870000 */ sd $a3,0x0($a0)
/* 12e54: 03e00008 */ jr $ra
/* 12e58: 0002103f */ dsra32 $v0,$v0,0x0
/* 12e5c: 00000000 */ nop
);
/**
* Split the given string into words and populate the argv array.
*/

2
src/lib/lib_0e9d0.c
View File

@ -15,7 +15,7 @@
#include "lib/lib_0d0a0.h"
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_2faf0.h"
#include "lib/lib_2fc60.h"
#include "lib/lib_317f0.h"

2
src/lib/main.c
View File

@ -47,6 +47,7 @@
#include "game/splat.h"
#include "game/utils.h"
#include "gvars/gvars.h"
#include "lib/args.h"
#include "lib/lib_070d0.h"
#include "lib/lib_074f0.h"
#include "lib/lib_09660.h"
@ -57,7 +58,6 @@
#include "lib/lib_0e9d0.h"
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/lib_12dc0.h"
#include "lib/lib_13750.h"
#include "lib/lib_13790.h"
#include "lib/lib_233c0.h"

2
src/lib/model.c
View File

@ -16,7 +16,7 @@
#include "game/game_157db0.h"
#include "game/game_166e40.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"

77
src/lib/rng.c Normal file
View File

@ -0,0 +1,77 @@
#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_02a0e0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/rng.h"
#include "lib/lib_2fa00.h"
#include "types.h"
u64 g_RngSeed = 0xab8d9f7781280783;
GLOBAL_ASM(
glabel random
/* 12dc0: 3c048006 */ lui $a0,%hi(g_RngSeed)
/* 12dc4: dc84ee00 */ ld $a0,%lo(g_RngSeed)($a0)
/* 12dc8: 3c018006 */ lui $at,%hi(g_RngSeed)
/* 12dcc: 000437fc */ dsll32 $a2,$a0,0x1f
/* 12dd0: 00042ff8 */ dsll $a1,$a0,0x1f
/* 12dd4: 000637fa */ dsrl $a2,$a2,0x1f
/* 12dd8: 0005283e */ dsrl32 $a1,$a1,0x0
/* 12ddc: 0004233c */ dsll32 $a0,$a0,0xc
/* 12de0: 00c53025 */ or $a2,$a2,$a1
/* 12de4: 0004203e */ dsrl32 $a0,$a0,0x0
/* 12de8: 00c43026 */ xor $a2,$a2,$a0
/* 12dec: 0006253a */ dsrl $a0,$a2,0x14
/* 12df0: 30840fff */ andi $a0,$a0,0xfff
/* 12df4: 00862026 */ xor $a0,$a0,$a2
/* 12df8: 0004103c */ dsll32 $v0,$a0,0x0
/* 12dfc: fc24ee00 */ sd $a0,%lo(g_RngSeed)($at)
/* 12e00: 03e00008 */ jr $ra
/* 12e04: 0002103f */ dsra32 $v0,$v0,0x0
);
// Commented because ld isn't happy with bitshifting a u64.
//u32 random(void)
//{
// g_RngSeed = ((g_RngSeed << 63) >> 31 | (g_RngSeed << 31) >> 32) ^ (g_RngSeed << 44) >> 32;
// g_RngSeed = g_RngSeed >> 20 & 0xfff ^ g_RngSeed;
//
// return g_RngSeed;
//}
GLOBAL_ASM(
glabel rngSetSeed
/* 12e08: 64840001 */ daddiu $a0,$a0,0x1
/* 12e0c: 3c018006 */ lui $at,%hi(g_RngSeed)
/* 12e10: fc24ee00 */ sd $a0,%lo(g_RngSeed)($at)
/* 12e14: 03e00008 */ jr $ra
/* 12e18: 24040000 */ addiu $a0,$zero,0x0
);
GLOBAL_ASM(
glabel func00012e1c
/* 12e1c: dc870000 */ ld $a3,0x0($a0)
/* 12e20: 000737fc */ dsll32 $a2,$a3,0x1f
/* 12e24: 00072ff8 */ dsll $a1,$a3,0x1f
/* 12e28: 000637fa */ dsrl $a2,$a2,0x1f
/* 12e2c: 0005283e */ dsrl32 $a1,$a1,0x0
/* 12e30: 00073b3c */ dsll32 $a3,$a3,0xc
/* 12e34: 00c53025 */ or $a2,$a2,$a1
/* 12e38: 0007383e */ dsrl32 $a3,$a3,0x0
/* 12e3c: 00c73026 */ xor $a2,$a2,$a3
/* 12e40: 00063d3a */ dsrl $a3,$a2,0x14
/* 12e44: 30e70fff */ andi $a3,$a3,0xfff
/* 12e48: 00e63826 */ xor $a3,$a3,$a2
/* 12e4c: 0007103c */ dsll32 $v0,$a3,0x0
/* 12e50: fc870000 */ sd $a3,0x0($a0)
/* 12e54: 03e00008 */ jr $ra
/* 12e58: 0002103f */ dsra32 $v0,$v0,0x0
/* 12e5c: 00000000 */ nop
);