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

Clean up uses of !PLATFORM_N64 vs PLATFORM_GC (#2134)

Browse source 
* Clean up uses of !PLATFORM_N64 vs PLATFORM_GC

* Put N64 button colors first
This commit is contained in:
cadmic 2024-09-06 02:18:59 -07:00 • committed by GitHub
parent 3faa1c6acc
commit 53b2110373
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/fp.s
View file

@ -6,7 +6,7 @@
.balign 16
#if PLATFORM_GC
#if !PLATFORM_N64
DATA(qNaN0x3FFFFF)
.word 0x7FBFFFFF
ENDDATA(qNaN0x3FFFFF)

6
src/code/fp_math.c
View file

@ -1,7 +1,7 @@
#include "z64math.h"
#include "macros.h"
#if PLATFORM_GC
#if !PLATFORM_N64
s32 gUseAtanContFrac;
#endif
@ -46,7 +46,7 @@ f32 Math_FNearbyIntF(f32 x) {
return nearbyintf(x);
}
#if PLATFORM_GC
#if !PLATFORM_N64
/* Arctangent approximation using a Taylor series (one quadrant) */
f32 Math_FAtanTaylorQF(f32 x) {
static const f32 coeffs[] = {
@ -173,7 +173,7 @@ f32 Math_FAtanContFracF(f32 x) {
#endif
}
#if PLATFORM_GC
#if !PLATFORM_N64
/**
* @return arctan(x) in radians, in (-pi/2,pi/2) range
*/

6
src/code/gfxprint.c
View file

@ -126,7 +126,7 @@ u8 sGfxPrintFontData[(16 * 256) / 2] = {
0x1B, 0xAA, 0x40, 0x21, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#if PLATFORM_GC
#if !PLATFORM_N64
// Can be used to set GFXP_FLAG_ENLARGE by default
static u8 sDefaultSpecialFlags;
#endif
@ -342,7 +342,7 @@ void GfxPrint_Init(GfxPrint* this) {
this->flags |= GFXP_FLAG_SHADOW;
this->flags |= GFXP_FLAG_UPDATE;
#if PLATFORM_GC
#if !PLATFORM_N64
if (sDefaultSpecialFlags & GFXP_FLAG_ENLARGE) {
this->flags |= GFXP_FLAG_ENLARGE;
} else {
@ -370,7 +370,7 @@ Gfx* GfxPrint_Close(GfxPrint* this) {
Gfx* ret;
this->flags &= ~GFXP_FLAG_OPEN;
#if PLATFORM_GC
#if !PLATFORM_N64
gDPPipeSync(this->dList++);
#endif
ret = this->dList;

6
src/code/rand.c
View file

@ -53,7 +53,7 @@
*/
static u32 sRandInt = 1;
#if PLATFORM_GC
#if !PLATFORM_N64
/**
* Space to store a value to be re-interpreted as a float.
*
@ -114,7 +114,7 @@ f32 Rand_ZeroOne(void) {
#endif
}
#if PLATFORM_GC
#if !PLATFORM_N64
/**
* Returns a pseudo-random floating-point number between -0.5f and 0.5f by the same manner in which Rand_ZeroOne
* generates its result.
@ -179,7 +179,7 @@ f32 Rand_ZeroOne_Variable(u32* rndNum) {
#endif
}
#if PLATFORM_GC
#if !PLATFORM_N64
/**
* Generates the next pseudo-random floating-point number between -0.5f and 0.5f from the provided rndNum.
*

2
src/code/z_eff_ss_dead.c
View file

@ -30,7 +30,7 @@ void func_80026400(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
Gfx* displayListHead;
f32 cos;
#if PLATFORM_GC
#if !PLATFORM_N64
if (arg3 == 0) {
return;
}

2
src/code/z_message.c
View file

@ -10,7 +10,7 @@
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
#if PLATFORM_N64
#if !PLATFORM_GC
#define OCARINA_BUTTON_A_PRIM_R 80
#define OCARINA_BUTTON_A_PRIM_G 150
#define OCARINA_BUTTON_A_PRIM_B 255

4
src/code/z_scene_table.c
View file

@ -137,7 +137,7 @@ Gfx sDefaultDisplayList[] = {
gsSPEndDisplayList(),
};
#if PLATFORM_N64 // Scene_Draw is at end of file in GC versions
#if PLATFORM_N64 // Scene_Draw is at end of file in GC/iQue versions
SceneDrawConfigFunc sSceneDrawConfigs[SDC_MAX] = {
Scene_DrawConfigDefault, // SDC_DEFAULT
@ -1693,7 +1693,7 @@ void Scene_DrawConfigBesitu(PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7910);
}
#if PLATFORM_GC // Scene_Draw is at beginning of file in N64 versions
#if !PLATFORM_N64 // Scene_Draw is at beginning of file in N64 versions
SceneDrawConfigFunc sSceneDrawConfigs[SDC_MAX] = {
Scene_DrawConfigDefault, // SDC_DEFAULT