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

Fix misc 14 (#1279)

Browse source 
* Remove fake temp in `BossDodongo_DrawEffects`

* `OS_WRITE` for `__osSpRawStartDma` `direction`

* remove outdated comment

* fixup osRecvMesg

* make sShopkeeperStores static

* `PHYSICAL_TO_VIRTUAL(gSegments[0])` -> `SEGMENTED_TO_VIRTUAL(NULL)` (mimics `CollisionHeader_SegmentedToVirtual`)

* Run formatter

* Remove assets from include path in suggested vscode properties

* Fix `osCreateMesgQueue` getting `OS_MESG_BLOCK` as `count` instead of `1`
This commit is contained in:
Dragorn421 2022-06-13 08:38:20 -07:00 • committed by GitHub
parent 93a6a1eb9a
commit 0832b5af68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -1667,7 +1667,7 @@ void BossDodongo_UpdateEffects(PlayState* play) {
}
void BossDodongo_DrawEffects(PlayState* play) {
MtxF* unkMtx;
s32 pad;
s16 i;
u8 materialFlag = 0;
BossDodongoEffect* eff;
@ -1678,7 +1678,6 @@ void BossDodongo_DrawEffects(PlayState* play) {
OPEN_DISPS(gfxCtx, "../z_boss_dodongo.c", 5228);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
unkMtx = &play->billboardMtxF;
for (i = 0; i < BOSS_DODONGO_EFFECT_COUNT; i++, eff++) {
if (eff->unk_24 == 1) {
@ -1691,7 +1690,7 @@ void BossDodongo_DrawEffects(PlayState* play) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, eff->color.r, eff->color.g, eff->color.b, eff->alpha);
Matrix_Translate(eff->unk_00.x, eff->unk_00.y, eff->unk_00.z, MTXMODE_NEW);
Matrix_ReplaceRotation(unkMtx);
Matrix_ReplaceRotation(&play->billboardMtxF);
Matrix_Scale(eff->unk_2C, eff->unk_2C, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_dodongo.c", 5253),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

2
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -193,7 +193,7 @@ typedef struct {
/* 0x06 */ s16 zOffset;
} ShopItem; // size 0x08
ShopItem sShopkeeperStores[][8] = {
static ShopItem sShopkeeperStores[][8] = {
{ { SI_DEKU_SHIELD, 50, 52, -20 },
{ SI_DEKU_NUTS_5, 50, 76, -20 },
{ SI_DEKU_NUTS_10, 80, 52, -3 },