Merge branch 'master' into tilemap-docs

1 files changed, 60 insertions, 60 deletions

diff --git a/src/roomInit.c b/src/roomInit.c
index 015bd220..5b974d07 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -239,7 +239,7 @@ void sub_StateChange_MinishPaths_MayorsCabin(void) {
 
     sub_080575C8(0x20);
 
-    if (gPlayerEntity.y.HALF.HI - gRoomControls.origin_y > 0x40)
+    if (gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y > 0x40)
         LoadRoomEntityList(&Entities_MinishPaths_MayorsCabin_gUnk_080D6138);
 }
 
@@ -400,7 +400,7 @@ u32 sub_unk3_HouseInteriors1_InnWestRoom(void) {
         index = 0;
         SetLocalFlag(BILL05_YADO1F_MATSU_T0);
     }
-    gRoomVars.field_0x6c[3] = gUnk_080D6A74[index];
+    gRoomVars.properties[3] = gUnk_080D6A74[index];
     return 1;
 }
 
@@ -410,8 +410,8 @@ void sub_StateChange_HouseInteriors1_InnWestRoom(void) {
     if (CheckLocalFlag(YADO_CHECKIN)) {
         ClearLocalFlag(YADO_CHECKIN);
         SetFade(FADE_IN_OUT | FADE_INSTANT, 256);
-        gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x50;
-        gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
+        gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + 0x50;
+        gPlayerEntity.base.y.HALF.HI = gRoomControls.origin_y + 0x38;
         sub_080751E8(1, 2, &script_PlayerSleepingInn);
     }
 }
@@ -428,7 +428,7 @@ u32 sub_unk3_HouseInteriors1_InnMiddleRoom(void) {
         index = 0;
         SetLocalFlag(BILL06_YADO1F_TAKE_T0);
     }
-    gRoomVars.field_0x6c[3] = gUnk_080D6B18[index];
+    gRoomVars.properties[3] = gUnk_080D6B18[index];
     return 1;
 }
 
@@ -436,8 +436,8 @@ void sub_StateChange_HouseInteriors1_InnMiddleRoom(void) {
     if (CheckLocalFlag(YADO_CHECKIN) != 0) {
         ClearLocalFlag(YADO_CHECKIN);
         SetFade(FADE_IN_OUT | FADE_INSTANT, 256);
-        gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x50;
-        gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
+        gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + 0x50;
+        gPlayerEntity.base.y.HALF.HI = gRoomControls.origin_y + 0x38;
         sub_080751E8(1, 2, &script_PlayerSleepingInn);
     }
 }
@@ -454,7 +454,7 @@ u32 sub_unk3_HouseInteriors1_InnEastRoom(void) {
         index = 0;
         SetLocalFlag(BILL07_YADO1F_UME_T0);
     }
-    gRoomVars.field_0x6c[3] = gUnk_080D6BB8[index];
+    gRoomVars.properties[3] = gUnk_080D6BB8[index];
     return 1;
 }
 
@@ -462,8 +462,8 @@ void sub_StateChange_HouseInteriors1_InnEastRoom(void) {
     if (CheckLocalFlag(YADO_CHECKIN)) {
         ClearLocalFlag(YADO_CHECKIN);
         SetFade(FADE_IN_OUT | FADE_INSTANT, 256);
-        gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x60;
-        gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
+        gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + 0x60;
+        gPlayerEntity.base.y.HALF.HI = gRoomControls.origin_y + 0x38;
         sub_080751E8(1, 2, &script_PlayerSleepingInn);
     }
 }
@@ -534,7 +534,7 @@ void sub_StateChange_HouseInteriors1_SchoolWest(void) {
     if (gSave.global_progress < 8) {
         LoadRoomEntityList(&gUnk_080D7038);
     }
-    if (gRoomVars.field_0x0 == 0) {
+    if (!gRoomVars.didEnterScrolling) {
         SetWorldMapPos(2, 0, 0x2c8, 0xa8);
     }
 }
@@ -567,8 +567,8 @@ extern u32 gUnk_080D7348;
 
 u32 sub_unk3_HyruleCastle_0(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080D7348;
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[0] = &gUnk_080D7348;
+        gRoomVars.properties[2] = 0;
     }
     return 1;
 }
@@ -601,8 +601,8 @@ extern u32 gUnk_080D7410;
 
 u32 sub_unk3_HyruleCastle_1(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080D7410;
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[0] = &gUnk_080D7410;
+        gRoomVars.properties[2] = 0;
     }
     return 1;
 }
@@ -682,8 +682,8 @@ extern u32 script_PlayerWakingUpInHyruleCastle;
 void sub_StateChange_HyruleCastle_4(void) {
     if (!CheckLocalFlag(CASTLE_04_MEZAME)) {
         SetFade(FADE_IN_OUT | FADE_INSTANT, 256);
-        gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0xb0;
-        gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x40;
+        gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + 0xb0;
+        gPlayerEntity.base.y.HALF.HI = gRoomControls.origin_y + 0x40;
         sub_080751E8(0, 6, &script_PlayerWakingUpInHyruleCastle);
 #ifdef EU
         SoundReq(SONG_STOP_ALL);
@@ -1078,7 +1078,7 @@ extern TileEntity gUnk_080D9328[];
 
 static void sub_0804C128(void) {
     sub_080AF250(0);
-    if (gRoomVars.field_0x0 != 0) {
+    if (gRoomVars.didEnterScrolling) {
         if ((gArea.unk_0c_1) == 0) {
             if ((gArea.unk_0c_4) == 0) {
                 gArea.unk_0c_1 = 1;
@@ -1272,7 +1272,7 @@ extern u32 gUnk_080DA230;
 
 u32 sub_unk3_CastorDarknut_Main(void) {
     if (!CheckLocalFlag(LV4_0a_TSUBO))
-        gRoomVars.field_0x6c[0] = &gUnk_080DA230;
+        gRoomVars.properties[0] = &gUnk_080DA230;
 
     return 1;
 }
@@ -1634,7 +1634,7 @@ extern u32 gUnk_080DB910;
 
 u32 sub_unk3_TownMinishHoles_LibraryBookshelf(void) {
     if (CheckGlobalFlag(MIZUKAKI_START) && !CheckLocalFlag(MIZUKAKI_BOOK_ALLBACK)) {
-        gRoomVars.field_0x6c[1] = &gUnk_080DB910;
+        gRoomVars.properties[1] = &gUnk_080DB910;
     }
     return 1;
 }
@@ -2126,7 +2126,7 @@ u32 sub_unk3_DeepwoodShrine_Madderpillar(void) {
 extern EntityData gUnk_080DE4C8;
 
 void sub_StateChange_DeepwoodShrine_Madderpillar(void) {
-    if ((gPlayerEntity.y.HALF.HI - gRoomControls.origin_y) < (gRoomControls.height >> 1)) {
+    if ((gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y) < (gRoomControls.height >> 1)) {
         if (!CheckLocalFlag(0x17)) {
             LoadRoomEntityList(&gUnk_080DE4C8);
         }
@@ -2457,7 +2457,7 @@ extern u32 gUnk_080E103C;
 
 u32 sub_unk3_CaveOfFlames_BeforeGleerok(void) {
     if (CheckGlobalFlag(LV2_CLEAR)) {
-        gRoomVars.field_0x6c[1] = &gUnk_080E103C;
+        gRoomVars.properties[1] = &gUnk_080E103C;
     }
     return 1;
 }
@@ -2518,7 +2518,7 @@ void sub_StateChange_CaveOfFlamesBoss_Main(void) {
     if (CheckGlobalFlag(LV2_CLEAR)) {
         gMapTop.bgSettings = 0;
         gScreen.lcd.displayControl &= ~DISPCNT_BG1_ON;
-        sub_0807AABC(&gPlayerEntity);
+        sub_0807AABC(&gPlayerEntity.base);
         LoadRoomEntityList(&gUnk_additional_a_CaveOfFlamesBoss_Main);
     } else {
         SoundReq(SONG_STOP_BGM);
@@ -3594,14 +3594,14 @@ void sub_StateChange_Vaati3_Main(void) {
 
     if ((gRoomTransition.field_0x38 & 1) && gRoomTransition.field_0x39) {
         if (gRoomTransition.field_0x3c == 1) {
-            gPlayerEntity.x.HALF.HI = gRoomTransition.field_0x48;
-            gPlayerEntity.y.HALF.HI = gRoomTransition.field_0x4a + 8;
+            gPlayerEntity.base.x.HALF.HI = gRoomTransition.field_0x48;
+            gPlayerEntity.base.y.HALF.HI = gRoomTransition.field_0x4a + 8;
         } else {
             if (gRoomTransition.field_0x3c) {
                 return;
             }
-            gPlayerEntity.x.HALF.HI = gRoomTransition.field_0x44;
-            gPlayerEntity.y.HALF.HI = gRoomTransition.field_0x46 + 8;
+            gPlayerEntity.base.x.HALF.HI = gRoomTransition.field_0x44;
+            gPlayerEntity.base.y.HALF.HI = gRoomTransition.field_0x46 + 8;
         }
     }
 }
@@ -3759,16 +3759,16 @@ extern u32 gUnk_080EB5D4;
 
 u32 sub_unk3_DarkHyruleCastle_1FEntrance(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080EB604;
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[0] = &gUnk_080EB604;
+        gRoomVars.properties[2] = 0;
         gArea.bgm = gArea.queued_bgm = BGM_BEAT_VAATI;
     } else if (CheckLocalFlag(0x79)) {
-        gRoomVars.field_0x6c[0] = NULL;
+        gRoomVars.properties[0] = NULL;
         if (!CheckLocalFlag(0x7a)) {
             SetGlobalFlag(ZELDA_CHASE);
-            gRoomVars.field_0x6c[0] = &gUnk_080EB5D4;
-            gRoomVars.field_0x6c[7] = sub_0804D9B0;
-            gRoomVars.field_0x6c[2] = 0;
+            gRoomVars.properties[0] = &gUnk_080EB5D4;
+            gRoomVars.properties[7] = sub_0804D9B0;
+            gRoomVars.properties[2] = 0;
         }
     }
     return 1;
@@ -3831,8 +3831,8 @@ void sub_StateChange_Dojos_ToSplitblade1(void) {
 
 u32 sub_unk3_DarkHyruleCastle_3FTripleDarknut(void) {
     if (!CheckLocalFlag(0x77)) {
-        gRoomVars.field_0x6c[0] = 0;
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[0] = 0;
+        gRoomVars.properties[2] = 0;
     }
     return 1;
 }
@@ -4024,7 +4024,7 @@ void sub_StateChange_Dojos_ToGreatblade8(void) {
 
 u32 sub_unk3_DarkHyruleCastle_B1Entrance(void) {
     if (CheckLocalFlag(0x79)) {
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[2] = 0;
     }
     return 1;
 }
@@ -4057,8 +4057,8 @@ extern u32 gUnk_080ED1E4;
 
 u32 sub_unk3_DarkHyruleCastle_1FThroneRoom(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080ED1E4;
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[0] = &gUnk_080ED1E4;
+        gRoomVars.properties[2] = 0;
     }
     return 1;
 }
@@ -4218,8 +4218,8 @@ void sub_StateChange_Ruins_Beanstalk1(void) {
 
 u32 sub_unk3_DarkHyruleCastle_B1Left(void) {
     if (CheckLocalFlag(0x79)) {
-        gRoomVars.field_0x6c[2] = 0;
-        gRoomVars.field_0x6c[0] = 0;
+        gRoomVars.properties[2] = 0;
+        gRoomVars.properties[0] = 0;
     }
     return 1;
 }
@@ -4243,7 +4243,7 @@ void sub_StateChange_Ruins_Beanstalk2(void) {
 
 u32 sub_unk3_DarkHyruleCastle_B1Map(void) {
     if (CheckLocalFlag(0x79)) {
-        gRoomVars.field_0x6c[2] = 0;
+        gRoomVars.properties[2] = 0;
     }
     return 1;
 }
@@ -4565,7 +4565,7 @@ extern u32 gUnk_080F09A0;
 
 u32 sub_unk3_CastleGarden_Main(void) {
     if (GetInventoryValue(ITEM_FOURSWORD)) {
-        gRoomVars.field_0x6c[1] = &gUnk_080F09A0;
+        gRoomVars.properties[1] = &gUnk_080F09A0;
     }
     return 1;
 }
@@ -4940,8 +4940,8 @@ void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) {
 extern u32 script_PlayerWakeAfterRest;
 
 void sub_0804E864(void) {
-    gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x90;
-    gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
+    gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + 0x90;
+    gPlayerEntity.base.y.HALF.HI = gRoomControls.origin_y + 0x38;
     sub_080751E8(1, 6, &script_PlayerWakeAfterRest);
     ModHealth(0xa0);
 }
@@ -5023,9 +5023,9 @@ extern u32 gUnk_080F3EA4;
 
 u32 sub_unk3_LakeHylia_Main(void) {
     if (CheckGlobalFlag(LV4_CLEAR) && !CheckLocalFlag(4)) {
-        gRoomVars.field_0x6c[2] = &gUnk_080F3EA4;
+        gRoomVars.properties[2] = &gUnk_080F3EA4;
     } else {
-        gRoomVars.field_0x6c[2] = &Enemies_LakeHylia_Main;
+        gRoomVars.properties[2] = &Enemies_LakeHylia_Main;
     }
     return 1;
 }
@@ -5178,8 +5178,8 @@ extern u32 gUnk_080F4EB0;
 
 u32 sub_unk3_MinishWoods_Main(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080F4EB0;
-        gRoomVars.field_0x6c[2] = NULL;
+        gRoomVars.properties[0] = &gUnk_080F4EB0;
+        gRoomVars.properties[2] = NULL;
     }
     return 1;
 }
@@ -5235,9 +5235,9 @@ extern u32 gUnk_080F5348;
 
 u32 sub_unk3_SanctuaryEntrance_Main(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080F5348;
-        gRoomVars.field_0x6c[7] = sub_0804ED18;
-        gRoomVars.field_0x6c[2] = NULL;
+        gRoomVars.properties[0] = &gUnk_080F5348;
+        gRoomVars.properties[7] = sub_0804ED18;
+        gRoomVars.properties[2] = NULL;
     }
     return 1;
 }
@@ -5688,7 +5688,7 @@ extern u32 gUnk_080F7680;
 
 u32 sub_unk3_HyruleField_EasternHillsNorth(void) {
     if (GetInventoryValue(ITEM_GUST_JAR) && !GetInventoryValue(ITEM_PACCI_CANE)) {
-        gRoomVars.field_0x6c[2] = &gUnk_080F7680;
+        gRoomVars.properties[2] = &gUnk_080F7680;
     }
     return 1;
 }
@@ -5749,13 +5749,13 @@ extern void sub_0804F4E4(void);
 
 u32 sub_unk3_HyruleField_OutsideCastle(void) {
     if (CheckGlobalFlag(TABIDACHI) && !GetInventoryValue(ITEM_GUST_JAR)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080F7CD0;
-        gRoomVars.field_0x6c[7] = sub_0804F5E8;
+        gRoomVars.properties[0] = &gUnk_080F7CD0;
+        gRoomVars.properties[7] = sub_0804F5E8;
     }
     if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(SOUGEN_06_SAIKAI)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080F7C80;
-        gRoomVars.field_0x6c[7] = sub_0804F4E4;
-        gRoomVars.field_0x6c[2] = NULL;
+        gRoomVars.properties[0] = &gUnk_080F7C80;
+        gRoomVars.properties[7] = sub_0804F4E4;
+        gRoomVars.properties[2] = NULL;
     }
 #ifndef EU
     if (CheckGlobalFlag(TABIDACHI)) {
@@ -6257,7 +6257,7 @@ extern u32 gUnk_080F9BF8;
 
 u32 sub_unk3_VeilFallsTop_Main(void) {
     if (!CheckKinstoneFused(KINSTONE_E)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080F9BF8;
+        gRoomVars.properties[0] = &gUnk_080F9BF8;
     }
     return 1;
 }
@@ -6543,8 +6543,8 @@ extern u32 gUnk_080FAD48;
 
 u32 sub_unk3_MtCrenel_MountainTop(void) {
     if (CheckGlobalFlag(ENDING)) {
-        gRoomVars.field_0x6c[0] = &gUnk_080FAD48;
-        gRoomVars.field_0x6c[2] = NULL;
+        gRoomVars.properties[0] = &gUnk_080FAD48;
+        gRoomVars.properties[2] = NULL;
     }
     return 1;
 }