mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-26 23:47:02 -04:00
Format gbi.h, move ucode defines to makefile (#1650)
* Format gbi.h, move ucode defines to makefile, correct usage of gDPSetDither * UCODE_DEFS -> GBI_DEFINES, add GBI_DOWHILE toggle * Define GBI_DOWHILE for bss calculations * Makefile thing
This commit is contained in:
+19
-2
@@ -1,6 +1,6 @@
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "prevent_bss_reordering2.h" // bumps the bss index by 65
|
||||
// clang-format off
|
||||
// Partial structs taken from "prevent_bss_reordering.h"
|
||||
// Partial structs taken from "prevent_bss_reordering.h", bumps the bss index by 56
|
||||
struct Dummy200 { int x; };
|
||||
struct Dummy201 { int x; };
|
||||
struct Dummy202 { int x; };
|
||||
@@ -14,12 +14,29 @@ struct Dummy209 { int x; };
|
||||
struct Dummy210 { int x; };
|
||||
struct Dummy211 { int x; };
|
||||
struct Dummy212 { int x; };
|
||||
struct Dummy213 { int x; };
|
||||
struct Dummy214 { int x; };
|
||||
struct Dummy215 { int x; };
|
||||
struct Dummy216 { int x; };
|
||||
struct Dummy217 { int x; };
|
||||
struct Dummy218 { int x; };
|
||||
struct Dummy219 { int x; };
|
||||
struct Dummy220 { int x; };
|
||||
struct Dummy221 { int x; };
|
||||
struct Dummy222 { int x; };
|
||||
struct Dummy223 { int x; };
|
||||
struct Dummy224 { int x; };
|
||||
struct Dummy225 { int x; };
|
||||
struct Dummy226 { int x; };
|
||||
struct Dummy227 { int x; };
|
||||
// clang-format on
|
||||
|
||||
// Headers are currently valued at 63 mod 256 (./tools/calc_bss.sh <headers>)
|
||||
#include "z64math.h"
|
||||
|
||||
#include "libc/stdbool.h"
|
||||
#include "PR/gu.h"
|
||||
// The bss index at this point should be 184
|
||||
|
||||
Vec3f gZeroVec3f = { 0.0f, 0.0f, 0.0f };
|
||||
Vec3s gZeroVec3s = { 0, 0, 0 };
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "z64bgcheck.h"
|
||||
|
||||
#include "libc64/fixed_point.h"
|
||||
|
||||
+1
-1
@@ -428,7 +428,7 @@ void Lights_DrawGlow(PlayState* play) {
|
||||
|
||||
gfx = Gfx_SetupDL65_NoCD(POLY_XLU_DISP);
|
||||
|
||||
gDPSetDither(gfx++, G_CD_NOISE);
|
||||
gDPSetDither(gfx++, G_AD_PATTERN | G_CD_NOISE);
|
||||
|
||||
gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
|
||||
0);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "global.h"
|
||||
#include "gfx.h"
|
||||
#include "sys_cmpdma.h"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "z64message.h"
|
||||
#include "global.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user