diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-14 00:49:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 19:49:40 -0500 |
| commit | f9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch) | |
| tree | 9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/code/z_map_exp.c | |
| parent | d615ec4f31563b939f8c0dce1c20c79e137c2043 (diff) | |
Fix most compiler warnings in the boot and code segments (#674)
* Less warnings in boot & code segments
* few more warnings gone
* Ran formatter
* z_view warning gone
* -> 1
* f31 -> 31
* Remove function casts
* Few more small improvements
* Separate declaration and assignment in func_80091738 and Item_Give
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Diffstat (limited to 'src/code/z_map_exp.c')
| -rw-r--r-- | src/code/z_map_exp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 509c95145..93fbdbd23 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -537,13 +537,12 @@ void Map_Update(GlobalContext* globalCtx) { } } - if (1) { // Appears to be necessary to match - gSaveContext.sceneFlags[mapIndex].floors |= gBitFlags[floor]; - VREG(30) = floor; - if (R_MAP_TEX_INDEX != (R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor))) { - R_MAP_TEX_INDEX = R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor); - } + gSaveContext.sceneFlags[mapIndex].floors |= gBitFlags[floor]; + VREG(30) = floor; + if (R_MAP_TEX_INDEX != (R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor))) { + R_MAP_TEX_INDEX = R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor); } + if (1) {} // Appears to be necessary to match if (interfaceCtx->mapRoomNum != sLastRoomNum) { // Translates to "Current floor = %d Current room = %x Number of rooms = %d" |