naming work

1 files changed, 29 insertions, 29 deletions

diff --git a/src/manager/manager4.c b/src/manager/manager4.c
index 48223e88..e287d521 100644
--- a/src/manager/manager4.c
+++ b/src/manager/manager4.c
@@ -18,29 +18,29 @@ extern DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance*, int);
 
 void sub_0805786C(Manager* this) {
     DiggingCaveEntrance* tmp;
-    u8 roomID;
-    u8 areaID;
+    u8 room;
+    u8 area;
     u16 uVar = 0x81 << 7;
     sub_080805F8();
     if (gUnk_03004030.unk_08 != 0) {
         if (gUnk_03004030.unk_00 == 0) {
             gUnk_03004030.unk_0a = 0xFF;
-            roomID = gRoomControls.roomID;
-            tmp = diggingCaveEntrances[gRoomControls.areaID];
-            tmp = sub_08057AA8(tmp, roomID);
+            room = gRoomControls.room;
+            tmp = diggingCaveEntrances[gRoomControls.area];
+            tmp = sub_08057AA8(tmp, room);
             if (tmp != 0) {
-                roomID = tmp->target_roomID;
-                tmp = diggingCaveEntrances[tmp->target_areaID];
-                tmp = sub_08057AA8(tmp, roomID);
+                room = tmp->target_room;
+                tmp = diggingCaveEntrances[tmp->target_area];
+                tmp = sub_08057AA8(tmp, room);
                 if (tmp != 0) {
                     gUnk_03004030.unk_00 = tmp;
                 }
             }
         }
-        roomID = gRoomControls.roomID;
-        tmp = diggingCaveEntrances[gRoomControls.areaID];
+        room = gRoomControls.room;
+        tmp = diggingCaveEntrances[gRoomControls.area];
         uVar = 0x81 << 7;
-        for (tmp = sub_08057AA8(tmp, roomID); tmp != 0; tmp = sub_08057AA8(tmp, roomID)) {
+        for (tmp = sub_08057AA8(tmp, room); tmp != 0; tmp = sub_08057AA8(tmp, room)) {
             SetTile(uVar, tmp->unk_00 + 0x3F, 1);
             SetTile(uVar, tmp->unk_00 + 0x40, 1);
             SetTile(uVar, tmp->unk_00 + 0x41, 1);
@@ -54,10 +54,10 @@ extern u32 sub_0805795C(Manager*, DiggingCaveEntrance*);
 
 void sub_08057920(Manager* this) {
     DiggingCaveEntrance* tmp;
-    u8 roomID;
-    roomID = gRoomControls.roomID;
-    for (tmp = diggingCaveEntrances[gRoomControls.areaID];
-         (tmp = sub_08057AA8(tmp, roomID)) != 0 && !sub_0805795C(this, tmp); tmp++)
+    u8 room;
+    room = gRoomControls.room;
+    for (tmp = diggingCaveEntrances[gRoomControls.area];
+         (tmp = sub_08057AA8(tmp, room)) != 0 && !sub_0805795C(this, tmp); tmp++)
         ;
 }
 
@@ -67,8 +67,8 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     u16 offsetX, offsetY, offsetX2, offsetY2;
     u32 tmp, tmp2;
     if (gUnk_03004030.unk_08) {
-        offsetX = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX;
-        offsetY = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
+        offsetX = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x;
+        offsetY = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y;
         offsetX2 = (entr->unk_00 & 0x3F) * 16 + 8;
         offsetY2 = ((entr->unk_00 & 0xFC0) >> 6) * 16 + 0x18;
         tmp = offsetX - offsetX2;
@@ -81,7 +81,7 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     } else {
         if (COORD_TO_TILE(&gPlayerEntity) != entr->unk_00)
             return 0;
-        offsetY2 = gRoomControls.roomOriginY + ((entr->unk_00 >> 6) << 4) + 6;
+        offsetY2 = gRoomControls.origin_y + ((entr->unk_00 >> 6) << 4) + 6;
         if (gPlayerEntity.y.HALF.HI >= offsetY2)
             return 0;
         sub_08057A18(this, entr);
@@ -98,29 +98,29 @@ void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
     u16 tmp;
     SetInitializationPriority();
     gUnk_03004030.unk_0a = gUnk_03004030.unk_09;
-    gUnk_03004030.unk_09 = gRoomControls.areaID;
-    gScreenTransition.player_status.area_next = entr->target_areaID;
-    gScreenTransition.player_status.room_next = entr->target_roomID;
-    gRoomControls.areaID = entr->target_areaID;
-    gRoomControls.roomID = entr->target_roomID;
+    gUnk_03004030.unk_09 = gRoomControls.area;
+    gRoomTransition.player_status.area_next = entr->target_area;
+    gRoomTransition.player_status.room_next = entr->target_room;
+    gRoomControls.area = entr->target_area;
+    gRoomControls.room = entr->target_room;
     gUnk_03004030.unk_00 = entr;
-    gUnk_03004030.unk_04 = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX - ((entr->unk_00 & 0x3F) * 16);
-    gUnk_03004030.unk_06 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY - ((entr->unk_00 & 0xFC0) >> 2);
+    gUnk_03004030.unk_04 = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x - ((entr->unk_00 & 0x3F) * 16);
+    gUnk_03004030.unk_06 = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y - ((entr->unk_00 & 0xFC0) >> 2);
     tmp = gUnk_03004030.unk_08;
     if (!tmp) {
-        if ((entr->target_roomID | 0x80) != gUnk_03004030.unk_0b) {
+        if ((entr->target_room | 0x80) != gUnk_03004030.unk_0b) {
             gUnk_02034480.unk_00 = gUnk_03004030.unk_08;
         }
-        gUnk_03004030.unk_0b = entr->target_roomID | 0x80;
+        gUnk_03004030.unk_0b = entr->target_room | 0x80;
     }
     sub_08080930(entr->unk_03);
     DeleteManager(this);
 }
 #endif
 
-DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance* entr, int roomID) {
+DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance* entr, int room) {
     for (; entr->unk_00 != 0xFFFF; entr++) {
-        if (entr->source_roomID == roomID)
+        if (entr->source_room == room)
             return entr;
     }
     return 0;