From 9730543780ab88b1d4abebee23f4d220abdbc206 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 9 May 2022 17:39:00 +0300
Subject: Match sub_08018738

---
 src/game.c     | 12 ++++++------
 src/kinstone.c |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/game.c b/src/game.c
index 1917a077..39396275 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2682,22 +2682,22 @@ void sub_08054968(void) {
 
 void sub_08054974(s32 param_1, s32 param_2) {
     struct_080FE320* ptr = &gUnk_080FE320[param_1];
-    SetCurrentRoomPropertyList(ptr->_2, ptr->_3);
-    gRoomControls.area = ptr->_2;
-    gRoomControls.room = ptr->_3;
+    SetCurrentRoomPropertyList(ptr->area, ptr->room);
+    gRoomControls.area = ptr->area;
+    gRoomControls.room = ptr->room;
     LoadGfxGroups();
     gArea.localFlagOffset = GetFlagBankOffset(gRoomControls.area);
     if (param_2 != 0) {
-        LoadAuxiliaryRoom(ptr->_2, ptr->_3);
+        LoadAuxiliaryRoom(ptr->area, ptr->room);
     } else {
-        sub_08052FF4(ptr->_2, ptr->_3);
+        sub_08052FF4(ptr->area, ptr->room);
         InitializeCamera();
         gUpdateVisibleTiles = 1;
     }
     gScreen.lcd.displayControl &= 0x1fff;
     gRoomControls.scroll_x = gRoomControls.origin_x + ptr->_4;
     gRoomControls.scroll_y = gRoomControls.origin_y + ptr->_6;
-    if (ptr->_2 == 2) {
+    if (ptr->area == AREA_HYRULE_TOWN) {
         TryLoadPrologueHyruleTown();
     }
     sub_08018710(gUI.field_0x3);
diff --git a/src/kinstone.c b/src/kinstone.c
index a8baaf50..aaf12d1e 100644
--- a/src/kinstone.c
+++ b/src/kinstone.c
@@ -22,6 +22,15 @@ void sub_08018BB4(int);
 void sub_08018A58(int);
 void sub_08018B50(int);
 void sub_080189EC(int);
+void sub_0801876C(int, int);
+
+void sub_08018738(u32 param_1, int param_2) {
+    struct_080FE320* ptr = &gUnk_080FE320[param_2];
+
+    if (ptr->area == gRoomControls.area && ptr->room == gRoomControls.room) {
+        sub_0801876C(param_2, CheckKinstoneFused(param_1));
+    }
+}
 
 void sub_0801876C(int param_1, int param_2) {
     Entity* roomEnt;
-- 
cgit v1.2.3