mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-15 12:24:39 +00:00
Merge branch 'master' into doc_pause_menu
This commit is contained in:
commit
9bbdbcc83f
24 changed files with 98 additions and 144 deletions
|
@ -552,7 +552,6 @@ void Map_Update(PlayState* play) {
|
|||
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) {
|
||||
// "Current floor = %d Current room = %x Number of rooms = %d"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue