From b9496691319640dfa8071a128263d26e9e8bce80 Mon Sep 17 00:00:00 2001 From: Maide <34639600+Kelebek1@users.noreply.github.com> Date: Sat, 19 Feb 2022 23:05:22 +0000 Subject: Door_Shutter (#623) * Door_Shutter * PR * Fix macro * PR Co-authored-by: angie --- src/code/z_room.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/code') diff --git a/src/code/z_room.c b/src/code/z_room.c index 1685acc80..f54882fd6 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -75,12 +75,10 @@ void Room_Init(GlobalContext* globalCtx, RoomContext* roomCtx) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/Room_AllocateAndLoad.s") -#ifdef NON_MATCHING s32 Room_StartRoomTransition(GlobalContext* globalCtx, RoomContext* roomCtx, s32 index) { - size_t size; - - // XXX: this should use a branch-likely if (roomCtx->unk31 == 0) { + s32 size; + roomCtx->prevRoom = roomCtx->currRoom; roomCtx->currRoom.num = index; roomCtx->currRoom.segment = NULL; @@ -101,9 +99,6 @@ s32 Room_StartRoomTransition(GlobalContext* globalCtx, RoomContext* roomCtx, s32 return 0; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_room/Room_StartRoomTransition.s") -#endif s32 Room_HandleLoadCallbacks(GlobalContext* globalCtx, RoomContext* roomCtx) { if (roomCtx->unk31 == 1) { -- cgit v1.2.3