diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-10-27 21:28:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 02:28:33 +0100 |
| commit | c6ec00f0dd25136178dbfb658645c50995b91d64 (patch) | |
| tree | b648cbc26d29a6b805fc4d9ef5e14bafd35cd016 /include | |
| parent | d76266d91e69683c71ff038a6d7afd51af3da129 (diff) | |
Match func_80142440 (z_vr_box.c OK) (#1127)
* match func_80142440
* run full formatter
* docs and cleanup
* PR Suggestions
Diffstat (limited to 'include')
| -rw-r--r-- | include/PR/gbi.h | 4 | ||||
| -rw-r--r-- | include/functions.h | 9 | ||||
| -rw-r--r-- | include/variables.h | 7 | ||||
| -rw-r--r-- | include/z64.h | 6 |
4 files changed, 10 insertions, 16 deletions
diff --git a/include/PR/gbi.h b/include/PR/gbi.h index 5cfe31785..07fa0ac2c 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -4132,7 +4132,7 @@ _DW({ \ #define gDPLoadMultiTile(pkt, timg, tmem, rtile, fmt, siz, width, height,\ uls, ult, lrs, lrt, pal, \ cms, cmt, masks, maskt, shifts, shiftt) \ -{ \ +_DW({ \ gDPSetTextureImage(pkt, fmt, siz, width, timg); \ gDPSetTile(pkt, fmt, siz, \ (((((lrs)-(uls)+1) * siz##_TILE_BYTES)+7)>>3), tmem, \ @@ -4154,7 +4154,7 @@ _DW({ \ (ult)<<G_TEXTURE_IMAGE_FRAC, \ (lrs)<<G_TEXTURE_IMAGE_FRAC, \ (lrt)<<G_TEXTURE_IMAGE_FRAC); \ -} +}) #define gsDPLoadTextureTile(timg, fmt, siz, width, height, \ diff --git a/include/functions.h b/include/functions.h index c98e3c021..27da5905e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2183,11 +2183,12 @@ void VisMono_Draw(VisMono* this, Gfx** gfxp); void func_801420C0(void* arg0); void func_801420F4(void* arg0); void func_80142100(void* arg0, Gfx** gfx, u32 arg2); -s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* vtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8); + +s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8); void func_80143148(SkyboxContext* skyboxCtx, s32 arg1); -void func_801431E8(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType); -void func_80143324(PlayState* play, SkyboxContext* skyboxCtx, s16 skyType); -void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType); +void Skybox_Setup(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId); +void func_80143324(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId); +void Skybox_Init(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId); Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z); void SkyboxDraw_SetColors(SkyboxContext* skyboxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB); void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z); diff --git a/include/variables.h b/include/variables.h index a3278c481..c381b4711 100644 --- a/include/variables.h +++ b/include/variables.h @@ -808,13 +808,6 @@ extern UNK_PTR D_801C5CB0; // extern UNK_TYPE1 D_801C5DE0; // extern UNK_TYPE1 D_801C5DF0; // extern UNK_TYPE1 D_801C5E00; -extern s32 D_801C5E30[]; // D_801C5E30 -extern u16 D_801C5E48[]; // D_801C5E48 -extern s32 D_801C5E88[]; // D_801C5E88 -extern s32 D_801C5E9C[]; // D_801C5E9C -extern s32 D_801C5EB0[]; // D_801C5EB0 -extern s16 D_801C5EC4[]; // D_801C5EC4 -extern struct_801C5F44 D_801C5F44[]; // D_801C5F44 // extern UNK_TYPE1 D_801C6A70; // extern UNK_TYPE2 D_801C6A74; diff --git a/include/z64.h b/include/z64.h index 4b2f45bbf..58d4b51de 100644 --- a/include/z64.h +++ b/include/z64.h @@ -645,9 +645,9 @@ typedef struct { typedef struct { /* 0x000 */ View view; - /* 0x168 */ void* skyboxStaticSegment[4]; - /* 0x178 */ void* skyboxPaletteStaticSegment; - /* 0x17C */ Gfx* dListBuf; + /* 0x168 */ void* staticSegments[4]; + /* 0x178 */ void* paletteStaticSegment; + /* 0x17C */ Gfx (*dListBuf)[150]; /* 0x180 */ Gfx* roomDL; /* 0x184 */ Vtx* roomVtx; /* 0x188 */ DmaRequest unk188; |