From fffc9d0bbb8082d532728e73fcb9282bfb809ba6 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Thu, 12 Oct 2023 21:44:01 -0400 Subject: [PATCH] minor tweaks --- include/z64map.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/include/z64map.h b/include/z64map.h index 2eba34577..b0cde3651 100644 --- a/include/z64map.h +++ b/include/z64map.h @@ -18,7 +18,6 @@ mapId mapCompactId 0x000-0x039 fetches dungeon minimap data from map_i_static 0x03A-0x09B fetches L-minimap data from map_grand_static - */ #define FLOOR_INDEX_MAX 4 @@ -33,7 +32,6 @@ mapCompactId #define MAPDATA_MID_MAP_GRAND_STATIC 1 #define MAPDATA_MID_MAP_I_STATIC 2 - #define MAPDATA_CPID_MAP_GRAND_STATIC 0 #define MAPDATA_CPID_MAP_I_STATIC 1 #define MAPDATA_CPID_2 2 @@ -43,6 +41,16 @@ mapCompactId #define MAPDATA_DRAW_2 2 #define MAPDATA_DRAW_3 3 +typedef struct { + u8 texWidth; + u8 texHeight; + s16 offsetX; + s16 offsetY; + u8 drawType; + u8 colorIndex; + s16 scale; +} MapSpriteInfo; // size 0x0A + typedef struct { /* 0x00 */ TexturePtr lmapTex; //minimap texture /* 0x04 */ u8 width; @@ -54,16 +62,6 @@ typedef struct { /* 0x0A */ s16 scale; } MapSpriteInfo2; // size 0x0C -typedef struct { - u8 texWidth; - u8 texHeight; - s16 offsetX; - s16 offsetY; - u8 drawType; - u8 colorIndex; - s16 scale; -} MapSpriteInfo; // size 0x0A - /* z_map_disp */ typedef struct {