diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-06-15 12:29:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 13:29:10 -0400 |
| commit | c644aaa2ee41a4cb9100e67dec002812e29e461b (patch) | |
| tree | 03936679f905d3876b855b2093cb132c25b4cb8b /src/code/z_map_mark.c | |
| parent | 566d107e55bd60553cf7a36bdbd6e2b7fb2460d1 (diff) | |
Interface improvements (#822)
* Add symbols, does NOT build OK
* parameter OK with syms
* Use `static` more and inline arrays
* wip docs
* Start on Interface_Draw, NOT OK yet
* rename variables since interface dev is weird
* nonmatching for now
* kaleido
* Update src/code/z_parameter.c
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Make most texture rectangles use shifts
* fix symbols for all interface things
* done with interface_draw for now
* Update z_parameter.c
* format files
* fix wrong function calls
* fix bss
* improvements in matching
* remove button enum for now
* (void)0 to fix warning
* make conditional look nicer
* fix
* fix wrong combiner
* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* format
* remove "HUD" naming
* review suggestions
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'src/code/z_map_mark.c')
| -rw-r--r-- | src/code/z_map_mark.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 4c976f8e6..ca25d4bbb 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -38,8 +38,8 @@ static u32 sLineBytesImageSizes[] = { 0, 1, 2, 2 }; #define G_IM_SIZ_MARK_LINE_BYTES sLineBytesImageSizes[markInfo->imageSize] static MapMarkInfo sMapMarkInfoTable[] = { - { gHUDTreasureMarkerTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 32, 32, 1024, 1024 }, // Chest Icon - { gHUDBossMarkerTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 32, 32, 1024, 1024 }, // Boss Skull Icon + { gMapChestIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 32, 32, 1 << 10, 1 << 10 }, // Chest Icon + { gMapBossIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 32, 32, 1 << 10, 1 << 10 }, // Boss Skull Icon }; static MapMarkDataOverlay sMapMarkDataOvl = { |