mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-30 20:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match sub_08018738

Browse Source
This commit is contained in:
Tal Hayon
2022-05-09 17:39:00 +03:00
parent dba74f4c92
commit 9730543780
4 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game.c
+6 -6
View File
@@ -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);
src/kinstone.c
+9
View File
@@ -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;