mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Rename variables in code_800FD970 (#142)

Browse source 
* Decompile code_800FD970

* Comment cleanups, ensure formatter won't cause a matching issue later

* Make code_800FD970 variables static and rename

* Delete data and bss asm files
This commit is contained in:
Tharo 2020-05-15 23:53:58 +01:00 committed by GitHub
parent 47e25298a0
commit 63985a0011
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/code_800FD970.bss.s
View file

@ -1,11 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .bss
glabel D_80175640
.space 0x10

11
data/code_800FD970.data.s
View file

@ -1,11 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .data
glabel D_801344C0
.incbin "baserom.z64", 0xBAB660, 0x10

28
src/code/code_800FD970.c
View file

@ -2,23 +2,23 @@
#include <global.h> #include <global.h>
// The latest generated random number, used to generate the next number in the sequence. // The latest generated random number, used to generate the next number in the sequence.
u32 randomNumber = 1; static u32 sRandInt = 1;
// Space to store a value to be re-interpreted as a float. // Space to store a value to be re-interpreted as a float.
u32 floatStore; static u32 sRandFloat;
/** /**
* Gets the next integer in the sequence of pseudo-random numbers. * Gets the next integer in the sequence of pseudo-random numbers.
*/ */
u32 Math_Rand_Next() { u32 Math_Rand_Next() {
return randomNumber = (randomNumber * 1664525) + 1013904223; return sRandInt = (sRandInt * 1664525) + 1013904223;
} }
/** /**
* Seeds the pseudo-random number generator by providing a starting value. * Seeds the pseudo-random number generator by providing a starting value.
*/ */
void Math_Rand_Seed(u32 seed) { void Math_Rand_Seed(u32 seed) {
randomNumber = seed; sRandInt = seed;
} }
/** /**
@ -27,9 +27,9 @@ void Math_Rand_Seed(u32 seed) {
* between 1.0f and 2.0f, returning the result subtract 1.0f. * between 1.0f and 2.0f, returning the result subtract 1.0f.
*/ */
f32 Math_Rand_ZeroOne() { f32 Math_Rand_ZeroOne() {
randomNumber = (randomNumber * 1664525) + 1013904223; sRandInt = (sRandInt * 1664525) + 1013904223;
floatStore = ((randomNumber >> 9) | 0x3F800000); sRandFloat = ((sRandInt >> 9) | 0x3F800000);
return *((f32*)&floatStore) - 1.0f; return *((f32*)&sRandFloat) - 1.0f;
} }
/** /**
@ -37,9 +37,9 @@ f32 Math_Rand_ZeroOne() {
* manner in which Math_Rand_ZeroOne generates its result. * manner in which Math_Rand_ZeroOne generates its result.
*/ */
f32 Math_Rand_Centered() { f32 Math_Rand_Centered() {
randomNumber = (randomNumber * 1664525) + 1013904223; sRandInt = (sRandInt * 1664525) + 1013904223;
floatStore = ((randomNumber >> 9) | 0x3F800000); sRandFloat = ((sRandInt >> 9) | 0x3F800000);
return *((f32*)&floatStore) - 1.5f; return *((f32*)&sRandFloat) - 1.5f;
} }
/** /**
@ -65,9 +65,9 @@ f32 Math_Rand_ZeroOne_Variable(u32* rndNum) {
next = (*rndNum * 1664525) + 1013904223; next = (*rndNum * 1664525) + 1013904223;
// clang-format off // clang-format off
*rndNum = next; floatStore = (next >> 9) | 0x3F800000; *rndNum = next; sRandFloat = (next >> 9) | 0x3F800000;
// clang-format on // clang-format on
return *((f32*)&floatStore) - 1.0f; return *((f32*)&sRandFloat) - 1.0f;
} }
/** /**
@ -79,7 +79,7 @@ f32 Math_Rand_Centered_Variable(u32* rndNum) {
next = (*rndNum * 1664525) + 1013904223; next = (*rndNum * 1664525) + 1013904223;
// clang-format off // clang-format off
*rndNum = next; floatStore = (next >> 9) | 0x3F800000; *rndNum = next; sRandFloat = (next >> 9) | 0x3F800000;
// clang-format on // clang-format on
return *((f32*)&floatStore) - 1.5f; return *((f32*)&sRandFloat) - 1.5f;
} }