Get within a flea's something or other of 37% (#285)

* match func_800A4154

* match func_800A497C

* nonmatching func_800A8474

* match func_800A3884

* Update game_ui.h

* quick fixes

* match func_800A4F50 and func_800A45F0

* Update game_ui.h

* prelim

* match func_8009CD7C and func_800AAFD0

* nonmatching func_800AC5A4

* warning

* smilng emote

* match func_800AC5A4

* Update weather.h

* Update weather.c

* fix a buncha warnings

* Update game_ui.c

* match func_80092E94

* I know what menu_5 is now :)

* Update game_ui.c

* Update menu.c

* match func_80068514

* match func_800B695C and func_800B69FC

* match func_8000FC6C

* quick fixes
This commit is contained in:
Fazana
2022-11-15 17:45:22 +00:00
committed by GitHub
parent b07b0b79c9
commit 04bee9fc2d
42 changed files with 777 additions and 2046 deletions
+10
View File
@@ -19,6 +19,7 @@
#define DKR_CC_UNK9 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0
#define DKR_CC_UNK10 TEXEL0, 0, SCALE, 0, 0, 0, 0, TEXEL0
#define DKR_CC_UNK11 ENVIRONMENT, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
#define DKR_CC_UNK12 0, 0, 0, ENVIRONMENT, 0, 0, 0, TEXEL0
#define DKR_CC_ENVIRONMENT 0, 0, 0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT
#define DKR_CC_DECALFADEPRIM 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
@@ -95,6 +96,9 @@
_g->words.w1 = (unsigned int)(address); \
}
#define gSPVertexDKR(pkt, v, n, v0) \
gDma1p(pkt, G_VTX, v, (((n) * 8 + (n)) << 1) + 8,((n)-1)<<3|(((u32)(v) & 6))|(v0))
#define TRIN_DISABLE_TEXTURE 0
#define TRIN_ENABLE_TEXTURE 1
@@ -107,6 +111,12 @@
_g->words.w1 = (unsigned int)(address); \
}
#define gSPPolygon(dl, ptr, numTris, texEnabled) { \
Gfx *_g = (Gfx *)(dl); \
_g->words.w0 = _SHIFTL(((numTris - 1) << 4) | (texEnabled), 16, 8) | _SHIFTL(G_TRIN, 24, 8) | _SHIFTL((numTris*16), 0, 16); \
_g->words.w1 = (unsigned int)(ptr); \
}
#define numberOfGfxCommands(gfxCmds) (sizeof(gfxCmds) / sizeof(Gwords))
#define gDkrDmaDisplayList(pkt, address, numberOfCommands) \