mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Move D_80134488 from system_heap.c to fp.s (#2387)

Browse source 
* Move D_80134488 from system_heap.c to fp.s

* Add declarations

* Fix bss
This commit is contained in:
cadmic 2024-12-24 09:49:31 -08:00 • committed by GitHub
parent 970639b38b
commit 8a48c17cc8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/libc/math.h
View file

@ -61,6 +61,10 @@ f64 sqrt(f64 f);
#endif #endif
#if !PLATFORM_N64 #if !PLATFORM_N64
extern float gPositiveInfinity;
extern float gNegativeInfinity;
extern float gPositiveZero;
extern float gNegativeZero;
extern float qNaN0x3FFFFF; extern float qNaN0x3FFFFF;
extern float qNaN0x10000; extern float qNaN0x10000;
extern float sNaN0x3FFFFF; extern float sNaN0x3FFFFF;

2
src/code/sys_math3d.c
View file

@ -5,7 +5,7 @@
#include "macros.h" #include "macros.h"
#include "sys_math3d.h" #include "sys_math3d.h"
#pragma increment_block_number "gc-eu:103 gc-eu-mq:103 gc-jp:103 gc-jp-ce:103 gc-jp-mq:103 gc-us:103 gc-us-mq:103" \ #pragma increment_block_number "gc-eu:99 gc-eu-mq:99 gc-jp:99 gc-jp-ce:99 gc-jp-mq:99 gc-us:99 gc-us-mq:99" \
"ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80" "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80"
s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,

16
src/libc64/fp.s
View file

@ -7,6 +7,22 @@
.balign 16 .balign 16
#if !PLATFORM_N64 #if !PLATFORM_N64
DATA(gPositiveInfinity)
.word 0x7F800000
ENDDATA(gPositiveInfinity)
DATA(gNegativeInfinity)
.word 0xFF800000
ENDDATA(gNegativeInfinity)
DATA(gPositiveZero)
.word 0x00000000
ENDDATA(gPositiveZero)
DATA(gNegativeZero)
.word 0x80000000
ENDDATA(gNegativeZero)
DATA(qNaN0x3FFFFF) DATA(qNaN0x3FFFFF)
.word 0x7FBFFFFF .word 0x7FBFFFFF
ENDDATA(qNaN0x3FFFFF) ENDDATA(qNaN0x3FFFFF)

7
src/libu64/system_heap.c
View file

@ -20,13 +20,6 @@ char sNew[] = "new";
char sNew[] = ""; char sNew[] = "";
#endif #endif
#if !PLATFORM_N64
char D_80134488[0x18] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00,
0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
#endif
// possibly some kind of new() function // possibly some kind of new() function
void* func_800FC800(u32 size) { void* func_800FC800(u32 size) {
DECLARE_INTERRUPT_MASK DECLARE_INTERRUPT_MASK

2
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -35,7 +35,7 @@
#include "cic6105.h" #include "cic6105.h"
#endif #endif
#pragma increment_block_number "gc-eu:170 gc-eu-mq:170 gc-jp:170 gc-jp-ce:170 gc-jp-mq:170 gc-us:170 gc-us-mq:170" \ #pragma increment_block_number "gc-eu:166 gc-eu-mq:166 gc-jp:166 gc-jp-ce:166 gc-jp-mq:166 gc-us:166 gc-us-mq:166" \
"ntsc-1.0:121 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121" "ntsc-1.0:121 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

2
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -345,7 +345,7 @@ static s32 sSavedCurrentMask;
static Vec3f sInteractWallCheckResult; static Vec3f sInteractWallCheckResult;
static Input* sControlInput; static Input* sControlInput;
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
"ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
// .data // .data